From c66d195089b1e1b823be4f0a0fc9b8f41f5f790d Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 24 Dec 2017 12:47:30 -0500 Subject: [PATCH 1/7] =?UTF-8?q?callba/callab=20=E2=86=92=20farcall/callfar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- battle/ai/items.asm | 36 +-- battle/ai/move.asm | 2 +- battle/ai/redundant.asm | 4 +- battle/ai/scoring.asm | 46 ++-- battle/anim_commands.asm | 14 +- battle/bg_effects.asm | 6 +- battle/core.asm | 246 ++++++++++---------- battle/effect_commands.asm | 70 +++--- battle/effects/attract.asm | 4 +- battle/effects/thief.asm | 4 +- battle/hidden_power.asm | 2 +- battle/link_result.asm | 2 +- battle/misc.asm | 4 +- battle/objects/engine.asm | 4 +- battle/trainer_huds.asm | 2 +- battle/used_move_text.asm | 2 +- data/items/item_descriptions.asm | 2 +- engine/anim_hp_bar.asm | 2 +- engine/battle_transition.asm | 10 +- engine/billspc.asm | 42 ++-- engine/billspctop.asm | 12 +- engine/breeding.asm | 14 +- engine/buy_sell_toss.asm | 4 +- engine/caught_data.asm | 6 +- engine/cgb_layouts.asm | 4 +- engine/clock_reset.asm | 4 +- engine/color.asm | 6 +- engine/consume_held_item.asm | 2 +- engine/crystal_colors.asm | 18 +- engine/crystal_intro.asm | 38 +-- engine/debug.asm | 4 +- engine/decorations.asm | 2 +- engine/delete_save_change_clock.asm | 6 +- engine/dummy_game.asm | 4 +- engine/events.asm | 56 ++--- engine/events_2.asm | 22 +- engine/events_3.asm | 16 +- engine/evolution_animation.asm | 10 +- engine/evolve.asm | 6 +- engine/fruit_trees.asm | 2 +- engine/get_breedmon_growth.asm | 4 +- engine/health.asm | 2 +- engine/init_gender.asm | 2 +- engine/init_map.asm | 6 +- engine/intro_menu.asm | 80 +++---- engine/item_effects.asm | 88 +++---- engine/link.asm | 106 ++++----- engine/link_trade.asm | 16 +- engine/mail.asm | 26 +-- engine/main_menu.asm | 10 +- engine/map_objects.asm | 16 +- engine/map_setup.asm | 6 +- engine/mart.asm | 24 +- engine/menu.asm | 10 +- engine/menu_2.asm | 2 +- engine/mon_icons.asm | 6 +- engine/mon_menu.asm | 4 +- engine/mon_stats.asm | 2 +- engine/move_mon.asm | 40 ++-- engine/move_mon_wo_mail.asm | 2 +- engine/mystery_gift.asm | 26 +-- engine/namingscreen.asm | 14 +- engine/new_pokedex_entry.asm | 8 +- engine/npctrade.asm | 14 +- engine/odd_eggs.asm | 2 +- engine/overworld.asm | 6 +- engine/pack.asm | 56 ++--- engine/party_menu.asm | 6 +- engine/phone/phone.asm | 20 +- engine/play_slow_cry.asm | 2 +- engine/player_movement.asm | 2 +- engine/player_step.asm | 2 +- engine/pokecenter_pc.asm | 38 +-- engine/pokedex.asm | 38 +-- engine/pokegear.asm | 60 ++--- engine/print_party.asm | 12 +- engine/printer.asm | 16 +- engine/radio.asm | 24 +- engine/rtc.asm | 4 +- engine/save.asm | 46 ++-- engine/scripting.asm | 120 +++++----- engine/select_menu.asm | 2 +- engine/slot_machine.asm | 14 +- engine/specials.asm | 44 ++-- engine/sprite_anims.asm | 28 +-- engine/start_battle.asm | 14 +- engine/start_menu.asm | 112 ++++----- engine/stats_screen.asm | 34 +-- engine/tempmon.asm | 2 +- engine/time.asm | 4 +- engine/timeset.asm | 4 +- engine/tmhm2.asm | 22 +- engine/trade_animation.asm | 14 +- engine/trademon_frontpic.asm | 4 +- engine/trainer_card.asm | 2 +- engine/unused_correct_party.asm | 4 +- engine/warp_connection.asm | 18 +- engine/wildmons.asm | 6 +- event/buena.asm | 6 +- event/bug_contest/caught_mon.asm | 4 +- event/bug_contest/contest.asm | 2 +- event/bug_contest/judging.asm | 6 +- event/catch_tutorial.asm | 2 +- event/celebi.asm | 4 +- event/daycare.asm | 36 +-- event/field_moves.asm | 30 +-- event/halloffame.asm | 28 +-- event/happiness_egg.asm | 2 +- event/itemfinder.asm | 2 +- event/kurt.asm | 10 +- event/lucky_number.asm | 2 +- event/magikarp.asm | 4 +- event/magnet_train.asm | 8 +- event/mom.asm | 16 +- event/mom_phone.asm | 12 +- event/move_deleter.asm | 4 +- event/move_tutor.asm | 8 +- event/name_rater.asm | 4 +- event/overworld.asm | 34 +-- event/poisonstep.asm | 4 +- event/poisonstep_pals.asm | 4 +- event/poke_seer.asm | 4 +- event/print_photo.asm | 4 +- event/print_unown.asm | 4 +- event/special.asm | 12 +- event/squirtbottle.asm | 2 +- event/sweet_scent.asm | 8 +- event/whiteout.asm | 4 +- gfx/mail.asm | 6 +- gfx/pics/animation.asm | 8 +- home.asm | 6 +- home/battle.asm | 4 +- home/copy.asm | 12 +- home/flag.asm | 2 +- home/init.asm | 4 +- home/item.asm | 4 +- home/joypad.asm | 2 +- home/map.asm | 30 +-- home/map_objects.asm | 14 +- home/math.asm | 2 +- home/menu.asm | 6 +- home/movement.asm | 4 +- home/names.asm | 2 +- home/rtc.asm | 4 +- home/serial.asm | 4 +- home/text.asm | 4 +- home/tilemap.asm | 6 +- home/time.asm | 4 +- home/window.asm | 6 +- macros/code.asm | 10 +- macros/rst.asm | 12 +- main.asm | 26 +-- mobile/battle_tower_5c.asm | 44 ++-- mobile/fixed_words.asm | 26 +-- mobile/mobile_12.asm | 6 +- mobile/mobile_12_2.asm | 18 +- mobile/mobile_22.asm | 50 ++-- mobile/mobile_22_2.asm | 2 +- mobile/mobile_40.asm | 344 ++++++++++++++-------------- mobile/mobile_41.asm | 2 +- mobile/mobile_42.asm | 36 +-- mobile/mobile_45.asm | 48 ++-- mobile/mobile_45_sprite_engine.asm | 18 +- mobile/mobile_46.asm | 250 ++++++++++---------- mobile/mobile_5b.asm | 18 +- mobile/mobile_5c.asm | 32 +-- mobile/mobile_5e.asm | 12 +- mobile/mobile_5f.asm | 84 +++---- mobile/mobile_menu.asm | 22 +- mobile/print_opp_message.asm | 2 +- 170 files changed, 1751 insertions(+), 1751 deletions(-) diff --git a/battle/ai/items.asm b/battle/ai/items.asm index 5346bf8f2..09595077a 100644 --- a/battle/ai/items.asm +++ b/battle/ai/items.asm @@ -9,7 +9,7 @@ AI_SwitchOrTryItem: ; 38000 and a ret nz - callba CheckEnemyLockedIn + farcall CheckEnemyLockedIn ret nz ld a, [PlayerSubStatus5] @@ -44,7 +44,7 @@ DontSwitch: ; 38041 ; 38045 SwitchOften: ; 38045 - callab CheckAbleToSwitch + callfar CheckAbleToSwitch ld a, [wEnemySwitchMonParam] and $f0 jp z, DontSwitch @@ -80,7 +80,7 @@ SwitchOften: ; 38045 ; 38083 SwitchRarely: ; 38083 - callab CheckAbleToSwitch + callfar CheckAbleToSwitch ld a, [wEnemySwitchMonParam] and $f0 jp z, DontSwitch @@ -115,7 +115,7 @@ SwitchRarely: ; 38083 ; 380c1 SwitchSometimes: ; 380c1 - callab CheckAbleToSwitch + callfar CheckAbleToSwitch ld a, [wEnemySwitchMonParam] and $f0 jp z, DontSwitch @@ -358,12 +358,12 @@ AI_Items: ; 39196 ld a, [bc] bit CONTEXT_USE_F, a jr nz, .CheckHalfOrQuarterHP - callab AICheckEnemyHalfHP + callfar AICheckEnemyHalfHP jp c, .DontUse ld a, [bc] bit UNKNOWN_USE_F, a jp nz, .CheckQuarterHP - callab AICheckEnemyQuarterHP + callfar AICheckEnemyQuarterHP jp nc, .UseHealItem call Random cp 1 + 50 percent @@ -371,7 +371,7 @@ AI_Items: ; 39196 jp .DontUse .CheckQuarterHP: ; 38254 (e:4254) - callab AICheckEnemyQuarterHP + callfar AICheckEnemyQuarterHP jp c, .DontUse call Random cp -1 + 20 percent @@ -379,9 +379,9 @@ AI_Items: ; 39196 jr .UseHealItem .CheckHalfOrQuarterHP: ; 38267 (e:4267) - callab AICheckEnemyHalfHP + callfar AICheckEnemyHalfHP jp c, .DontUse - callab AICheckEnemyQuarterHP + callfar AICheckEnemyQuarterHP jp nc, .UseHealItem call Random cp -1 + 20 percent @@ -416,7 +416,7 @@ AI_Items: ; 39196 ; 382ae .asm_382ae ; This appears to be unused - callab AICheckEnemyMaxHP + callfar AICheckEnemyMaxHP jr c, .dont_use push bc ld de, EnemyMonMaxHP + 1 @@ -433,7 +433,7 @@ AI_Items: ; 39196 ld a, c cp b jp c, .check_50_percent - callab AICheckEnemyQuarterHP + callfar AICheckEnemyQuarterHP jr c, .check_40_percent .check_50_percent @@ -545,7 +545,7 @@ AI_Items: ; 39196 AIUpdateHUD: ; 38387 call UpdateEnemyMonInParty - callba UpdateEnemyHUD + farcall UpdateEnemyHUD ld a, $1 ld [hBGMapMode], a ld hl, wEnemyItemState @@ -705,7 +705,7 @@ AI_Switch: ; 3846c res SUBSTATUS_RAGE, [hl] xor a ld [hBattleTurn], a - callab PursuitSwitch + callfar PursuitSwitch push af ld a, [CurOTMon] @@ -726,12 +726,12 @@ AI_Switch: ; 3846c .skiptext ld a, 1 ld [wBattleHasJustStarted], a - callab NewEnemyMonStatus - callab ResetEnemyStatLevels + callfar NewEnemyMonStatus + callfar ResetEnemyStatLevels ld hl, PlayerSubStatus1 res SUBSTATUS_IN_LOVE, [hl] - callba EnemySwitch - callba ResetBattleParticipants + farcall EnemySwitch + farcall ResetBattleParticipants xor a ld [wBattleHasJustStarted], a ld a, [wLinkMode] @@ -851,7 +851,7 @@ EnemyUsedXItem: push bc call PrintText_UsedItemOn pop bc - callba CheckIfStatCanBeRaised + farcall CheckIfStatCanBeRaised jp AIUpdateHUD ; 38568 diff --git a/battle/ai/move.asm b/battle/ai/move.asm index 6e5aca358..11586c0da 100755 --- a/battle/ai/move.asm +++ b/battle/ai/move.asm @@ -12,7 +12,7 @@ AIChooseMove: ; 440ce ret nz ; No use picking a move if there's no choice. - callba CheckEnemyLockedIn + farcall CheckEnemyLockedIn ret nz diff --git a/battle/ai/redundant.asm b/battle/ai/redundant.asm index e3dda8c4b..2e8f7c6df 100755 --- a/battle/ai/redundant.asm +++ b/battle/ai/redundant.asm @@ -141,7 +141,7 @@ AI_Redundant: ; 2c41a jr .NotRedundant .Attract: ; 2c4fe - callba CheckOppositeGender + farcall CheckOppositeGender jr c, .Redundant ld a, [PlayerSubStatus1] bit SUBSTATUS_IN_LOVE, a @@ -184,7 +184,7 @@ AI_Redundant: ; 2c41a .MorningSun: .Synthesis: .Moonlight: ; 2c539 - callba AICheckEnemyMaxHP + farcall AICheckEnemyMaxHP jr nc, .NotRedundant .Teleport: diff --git a/battle/ai/scoring.asm b/battle/ai/scoring.asm index 4e462656c..6391e3b29 100644 --- a/battle/ai/scoring.asm +++ b/battle/ai/scoring.asm @@ -29,7 +29,7 @@ AI_Basic: ; 38591 push hl push de push bc - callba AI_Redundant + farcall AI_Redundant pop bc pop de pop hl @@ -176,7 +176,7 @@ AI_Types: ; 38635 push de ld a, 1 ld [hBattleTurn], a - callab BattleCheckTypeMatchup + callfar BattleCheckTypeMatchup pop de pop bc pop hl @@ -429,7 +429,7 @@ AI_Smart_LeechHit: ; 387f7 push hl ld a, 1 ld [hBattleTurn], a - callab BattleCheckTypeMatchup + callfar BattleCheckTypeMatchup pop hl ; 60% chance to discourage this move if not very effective. @@ -510,7 +510,7 @@ AI_Smart_LockOn: ; 3881d push hl push bc - callba BattleCheckTypeMatchup + farcall BattleCheckTypeMatchup ld a, [wd265] cp $a pop bc @@ -572,7 +572,7 @@ AI_Smart_Selfdestruct: ; 388a6 ; Unless this is the enemy's last Pokemon... push hl - callba FindAliveEnemyMons + farcall FindAliveEnemyMons pop hl jr nc, .asm_388b7 @@ -970,7 +970,7 @@ AI_Smart_ForceSwitch: ; 38a2a ; Consider player's type(s) if its moves are unknown. push hl - callab CheckPlayerMoveTypeMatchups + callfar CheckPlayerMoveTypeMatchups ld a, [wEnemyAISwitchScore] cp 10 ; neutral pop hl @@ -1368,7 +1368,7 @@ AI_Smart_Mimic: ; 38ba8 ld a, $1 ld [hBattleTurn], a - callab BattleCheckTypeMatchup + callfar BattleCheckTypeMatchup ld a, [wd265] cp $a @@ -1763,9 +1763,9 @@ AI_Smart_PriorityHit: ; 38d5a ld a, $1 ld [hBattleTurn], a push hl - callab EnemyAttackDamage - callab BattleCommand_DamageCalc - callab BattleCommand_Stab + callfar EnemyAttackDamage + callfar BattleCommand_DamageCalc + callfar BattleCommand_Stab pop hl ld a, [CurDamage + 1] ld c, a @@ -1811,7 +1811,7 @@ AI_Smart_Conversion2: ; 38d98 xor a ld [hBattleTurn], a - callab BattleCheckTypeMatchup + callfar BattleCheckTypeMatchup ld a, [wd265] cp $a @@ -1890,7 +1890,7 @@ AI_Smart_MeanLook: ; 38dfb ; Otherwise, discourage this move unless the player only has not very effective moves against the enemy. push hl - callab CheckPlayerMoveTypeMatchups + callfar CheckPlayerMoveTypeMatchups ld a, [wEnemyAISwitchScore] cp $b ; not very effective pop hl @@ -2008,7 +2008,7 @@ AI_Smart_Curse: ; 38e5c jp nz, AIDiscourageMove push hl - callba FindAliveEnemyMons + farcall FindAliveEnemyMons pop hl jr nc, .asm_38eb0 @@ -2137,7 +2137,7 @@ AI_Smart_Foresight: ; 38f1d AI_Smart_PerishSong: ; 38f4a push hl - callab FindAliveEnemyMons + callfar FindAliveEnemyMons pop hl jr c, .no @@ -2146,7 +2146,7 @@ AI_Smart_PerishSong: ; 38f4a jr nz, .yes push hl - callab CheckPlayerMoveTypeMatchups + callfar CheckPlayerMoveTypeMatchups ld a, [wEnemyAISwitchScore] cp 10 ; 1.0 pop hl @@ -2404,7 +2404,7 @@ AI_Smart_BatonPass: ; 39062 ; Consider player's type(s) if its moves are unknown. push hl - callab CheckPlayerMoveTypeMatchups + callfar CheckPlayerMoveTypeMatchups ld a, [wEnemyAISwitchScore] cp 10 ; neutral pop hl @@ -2466,8 +2466,8 @@ AI_Smart_HiddenPower: ; 3909e ld [hBattleTurn], a ; Calculate Hidden Power's type and base power based on enemy's DVs. - callab HiddenPowerDamage - callab BattleCheckTypeMatchup + callfar HiddenPowerDamage + callfar BattleCheckTypeMatchup pop hl ; Discourage Hidden Power if not very effective. @@ -3336,13 +3336,13 @@ AIDamageCalc: ; 393e7 ld hl, .ConstantDamageEffects call IsInArray jr nc, .asm_39400 - callab BattleCommand_ConstantDamage + callfar BattleCommand_ConstantDamage ret .asm_39400 - callab EnemyAttackDamage - callab BattleCommand_DamageCalc - callab BattleCommand_Stab + callfar EnemyAttackDamage + callfar BattleCommand_DamageCalc + callfar BattleCommand_Stab ret .ConstantDamageEffects: @@ -3459,7 +3459,7 @@ AI_Status: ; 39453 push de ld a, 1 ld [hBattleTurn], a - callab BattleCheckTypeMatchup + callfar BattleCheckTypeMatchup pop de pop bc pop hl diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index 530f30d2b..561d509d7 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -61,7 +61,7 @@ BattleAnimRunScript: ; cc11c and a jr nz, .hi_byte - callba CheckBattleScene + farcall CheckBattleScene jr c, .disabled call BattleAnimClearHud @@ -169,7 +169,7 @@ BattleAnimRestoreHuds: ; cc1bb ld hl, UpdateBattleHuds ld a, BANK(UpdatePlayerHUD) - rst FarCall ; Why the heck is this a callab? + rst FarCall ; Why not "call UpdateBattleHuds"? pop af ld [rSVBK], a @@ -907,7 +907,7 @@ BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e) ret BattleAnimCmd_CheckPokeball: ; cc5d0 (33:45d0) - callab GetPokeBallWobble + callfar GetPokeBallWobble ld a, c ld [BattleAnimVar], a ret @@ -1128,11 +1128,11 @@ BattleAnimCmd_DropSub: ; cc750 (33:4750) and a jr z, .player - callab DropEnemySub + callfar DropEnemySub jr .done .player - callab DropPlayerSub + callfar DropPlayerSub .done pop af @@ -1221,7 +1221,7 @@ BattleAnimCmd_Sound: ; cc7cd (33:47cd) call GetBattleAnimByte ld e, a ld d, 0 - callab PlayStereoSFX + callfar PlayStereoSFX ret ; cc7f8 (33:47f8) @@ -1311,7 +1311,7 @@ endr ld a, 1 ld [wStereoPanningMask], a - callab _PlayCryHeader + callfar _PlayCryHeader .done pop af diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm index fdb27af13..cfd342df7 100644 --- a/battle/bg_effects.asm +++ b/battle/bg_effects.asm @@ -550,7 +550,7 @@ BattleBGEffect_HeadFollow: ; c8281 (32:4281) ret _QueueBattleAnimation: ; c82ee (32:42ee) - callab QueueBattleAnimation + callfar QueueBattleAnimation ret BattleBGEffect_27: ; c82f5 (32:42f5) @@ -2944,13 +2944,13 @@ BattleBGEffects_CheckSGB: ; c9059 (32:5059) BattleBGEffects_Sine: ; c905d (32:505d) ld e, a - callab BattleAnim_Sine_e + callfar BattleAnim_Sine_e ld a, e ret BattleBGEffects_Cosine: ; c9066 (32:5066) ld e, a - callab BattleAnim_Cosine_e + callfar BattleAnim_Cosine_e ld a, e ret diff --git a/battle/core.asm b/battle/core.asm index 438c08f08..593caf649 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -175,13 +175,13 @@ BattleTurn: ; 3c12f call HandleBerserkGene call UpdateBattleMonInParty - callba AIChooseMove + farcall AIChooseMove call IsMobileBattle jr nz, .not_disconnected - callba Function100da5 - callba StartMobileInactivityTimer - callba Function100dd8 + farcall Function100da5 + farcall StartMobileInactivityTimer + farcall Function100dd8 jp c, .quit .not_disconnected @@ -377,7 +377,7 @@ HandleBerserkGene: ; 3c27c .go push de push bc - callab GetUserItem + callfar GetUserItem ld a, [hl] ld [wd265], a sub BERSERK_GENE @@ -405,14 +405,14 @@ HandleBerserkGene: ; 3c27c ld [hl], a ld [AttackMissed], a ld [EffectFailed], a - callba BattleCommand_AttackUp2 + farcall BattleCommand_AttackUp2 pop af pop hl ld [hl], a call GetItemName ld hl, BattleText_UsersStringBuffer1Activated call StdBattleTextBox - callab BattleCommand_StatUpMessage + callfar BattleCommand_StatUpMessage pop af bit SUBSTATUS_CONFUSED, a ret nz @@ -473,7 +473,7 @@ DetermineMoveOrder: ; 3c314 jp .player_first .switch - callab AI_Switch + callfar AI_Switch call SetEnemyTurn call SpikesDamage jp .enemy_first @@ -489,9 +489,9 @@ DetermineMoveOrder: ; 3c314 .equal_priority call SetPlayerTurn - callab GetUserItem + callfar GetUserItem push bc - callab GetOpponentItem + callfar GetOpponentItem pop de ld a, d cp HELD_QUICK_CLAW @@ -651,7 +651,7 @@ ParsePlayerAction: ; 3c434 .encored call SetPlayerTurn - callab UpdateMoveData + callfar UpdateMoveData xor a ld [wPlayerCharging], a ld a, [wPlayerMoveStruct + MOVE_EFFECT] @@ -894,7 +894,7 @@ Battle_EnemyFirst: ; 3c5fe call SetEnemyTurn ld a, $1 ld [wEnemyGoesFirst], a - callab AI_SwitchOrTryItem + callfar AI_SwitchOrTryItem jr c, .switch_item call EnemyTurn_EndOpponentProtectEndureDestinyBond call CheckMobileBattleError @@ -935,7 +935,7 @@ Battle_PlayerFirst: ; 3c664 xor a ld [wEnemyGoesFirst], a call SetEnemyTurn - callab AI_SwitchOrTryItem + callfar AI_SwitchOrTryItem push af call PlayerTurn_EndOpponentProtectEndureDestinyBond pop bc @@ -984,14 +984,14 @@ Battle_PlayerFirst: ; 3c664 PlayerTurn_EndOpponentProtectEndureDestinyBond: ; 3c6cf call SetPlayerTurn call EndUserDestinyBond - callab DoPlayerTurn + callfar DoPlayerTurn jp EndOpponentProtectEndureDestinyBond ; 3c6de EnemyTurn_EndOpponentProtectEndureDestinyBond: ; 3c6de call SetEnemyTurn call EndUserDestinyBond - callab DoEnemyTurn + callfar DoEnemyTurn jp EndOpponentProtectEndureDestinyBond ; 3c6ed @@ -1323,7 +1323,7 @@ HandleLeftovers: ; 3c8eb call SetPlayerTurn .do_it - callab GetUserItem + callfar GetUserItem ld a, [hl] ld [wd265], a call GetItemName @@ -1373,7 +1373,7 @@ HandleMysteryberry: ; 3c93c call SetPlayerTurn .do_it - callab GetUserItem + callfar GetUserItem ld a, b cp HELD_RESTORE_PP jr nz, .quit @@ -1470,7 +1470,7 @@ HandleMysteryberry: ; 3c93c add b ld [de], a .skip_checks - callab GetUserItem + callfar GetUserItem ld a, [hl] ld [wd265], a xor a @@ -1536,13 +1536,13 @@ HandleFutureSight: ; 3ca26 ld a, FUTURE_SIGHT ld [hl], a - callab UpdateMoveData + callfar UpdateMoveData xor a ld [AttackMissed], a ld [AlreadyDisobeyed], a ld a, 10 ld [TypeModifier], a - callab DoMove + callfar DoMove xor a ld [CurDamage], a ld [CurDamage + 1], a @@ -2359,7 +2359,7 @@ HandleEnemySwitch: ; 3cf4a ld e, HP_BAR_LENGTH_PX call UpdateHPPal call WaitBGMap - callba EnemySwitch_TrainerHud + farcall EnemySwitch_TrainerHud ld a, [wLinkMode] and a jr z, .not_linked @@ -2417,7 +2417,7 @@ WinTrainerBattle: ; 3cfa4 and a ld a, b call z, PlayVictoryMusic - callab Battle_GetTrainerName + callfar Battle_GetTrainerName ld hl, BattleText_EnemyWasDefeated call StdBattleTextBox @@ -2452,7 +2452,7 @@ WinTrainerBattle: ; 3cfa4 ld c, 40 call DelayFrames ld c, $4 ; win - callba Mobile_PrintOpponentBattleMessage + farcall Mobile_PrintOpponentBattleMessage ret .battle_tower @@ -2461,7 +2461,7 @@ WinTrainerBattle: ; 3cfa4 call DelayFrames call EmptyBattleTextBox ld c, $3 - callba BattleTowerText + farcall BattleTowerText call WaitPressAorB_BlinkCursor ld hl, wPayDayMoney ld a, [hli] @@ -2589,7 +2589,7 @@ AddBattleMoneyToAccount: ; 3d0be push bc ld b, h ld c, l - callba TrainerRankings_AddToBattlePayouts + farcall TrainerRankings_AddToBattlePayouts pop bc pop hl .loop @@ -2783,7 +2783,7 @@ PlayerMonFaintHappinessMod: ; 3d1aa .got_param ld a, [CurBattleMon] ld [CurPartyMon], a - callab ChangeHappiness + callfar ChangeHappiness ld a, [wBattleResult] and %11000000 add $1 @@ -2932,16 +2932,16 @@ IsMobileBattle: ; 3d2f1 SetUpBattlePartyMenu_NoLoop: ; 3d2f7 call ClearBGPalettes SetUpBattlePartyMenu: ; switch to fullscreen menu? - callba LoadPartyMenuGFX - callba InitPartyMenuWithCancel - callba InitPartyMenuBGPal7 - callba InitPartyMenuGFX + farcall LoadPartyMenuGFX + farcall InitPartyMenuWithCancel + farcall InitPartyMenuBGPal7 + farcall InitPartyMenuGFX ret ; 3d313 JumpToPartyMenuAndPrintText: ; 3d313 - callba WritePartyMenuTilemap - callba PrintPartyMenuText + farcall WritePartyMenuTilemap + farcall PrintPartyMenuText call WaitBGMap call SetPalettes call DelayFrame @@ -2951,11 +2951,11 @@ JumpToPartyMenuAndPrintText: ; 3d313 SelectBattleMon: ; 3d329 call IsMobileBattle jr z, .mobile - callba PartyMenuSelect + farcall PartyMenuSelect ret .mobile - callba Mobile_PartyMenuSelect + farcall Mobile_PartyMenuSelect ret ; 3d33c @@ -3067,7 +3067,7 @@ LostBattle: ; 3d38e call EmptyBattleTextBox ld c, 2 - callba BattleTowerText + farcall BattleTowerText call WaitPressAorB_BlinkCursor call ClearTileMap call ClearBGPalettes @@ -3118,7 +3118,7 @@ LostBattle: ; 3d38e call DelayFrames ld c, $3 ; lost - callba Mobile_PrintOpponentBattleMessage + farcall Mobile_PrintOpponentBattleMessage scf ret ; 3d432 @@ -3424,7 +3424,7 @@ LookUpTheEffectivenessOfEveryMove: ; 3d5d7 ld a, BANK(Moves) call FarCopyBytes call SetEnemyTurn - callab BattleCheckTypeMatchup + callfar BattleCheckTypeMatchup pop bc pop de pop hl @@ -3460,13 +3460,13 @@ IsThePlayerPkmnTypesEffectiveAgainstOTPkmn: ; 3d618 ld a, [BattleMonType1] ld [wPlayerMoveStruct + MOVE_TYPE], a call SetPlayerTurn - callab BattleCheckTypeMatchup + callfar BattleCheckTypeMatchup ld a, [wd265] cp 10 + 1 ; 1.0 + 0.1 jr nc, .super_effective ld a, [BattleMonType2] ld [wPlayerMoveStruct + MOVE_TYPE], a - callab BattleCheckTypeMatchup + callfar BattleCheckTypeMatchup ld a, [wd265] cp 10 + 1 ; 1.0 + 0.1 jr nc, .super_effective @@ -3608,7 +3608,7 @@ CheckWhetherToAskSwitch: ; 3d714 push af ld a, [CurBattleMon] ld [CurPartyMon], a - callba CheckCurPartyMonFainted + farcall CheckCurPartyMonFainted pop bc ld a, b ld [CurPartyMon], a @@ -3624,7 +3624,7 @@ CheckWhetherToAskSwitch: ; 3d714 OfferSwitch: ; 3d74b ld a, [CurPartyMon] push af - callab Battle_GetTrainerName + callfar Battle_GetTrainerName ld hl, BattleText_EnemyIsAboutToUseWillPlayerChangePkmn call StdBattleTextBox lb bc, 1, 7 @@ -3675,7 +3675,7 @@ ClearEnemyMonBox: ; 3d7a0 ; 3d7b8 Function_BattleTextEnemySentOut: ; 3d7b8 - callab Battle_GetTrainerName + callfar Battle_GetTrainerName ld hl, BattleText_EnemySentOut call StdBattleTextBox jp WaitBGMap @@ -3707,9 +3707,9 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7 .not_shiny ld bc, TempMonSpecies - callba CheckFaintedFrzSlp + farcall CheckFaintedFrzSlp jr c, .skip_cry - callba CheckBattleScene + farcall CheckBattleScene jr c, .cry_no_anim hlcoord 12, 0 ld d, $0 @@ -3851,7 +3851,7 @@ TryToRunAwayFromBattle: ; 3d8b3 ld a, [BattleMonItem] ld [wd265], a ld b, a - callab GetItemHeldEffect + callfar GetItemHeldEffect ld a, b cp HELD_ESCAPE pop de @@ -4054,7 +4054,7 @@ BattleCheckEnemyShininess: ; 3da79 BattleCheckShininess: ; 3da7c ld b, h ld c, l - callab CheckShininess + callfar CheckShininess ret ; 3da85 @@ -4208,7 +4208,7 @@ SendOutPlayerMon: ; 3db5f call GetPartyParamLocation ld b, h ld c, l - callba CheckFaintedFrzSlp + farcall CheckFaintedFrzSlp jr c, .statused ld a, $f0 ld [CryTracks], a @@ -4418,7 +4418,7 @@ HandleHealingItems: ; 3dcf9 ; 3dd2f HandleHPHealingItem: ; 3dd2f - callab GetOpponentItem + callfar GetOpponentItem ld a, b cp HELD_BERRY ret nz @@ -4502,11 +4502,11 @@ HandleHPHealingItem: ; 3dd2f predef AnimateHPBar UseOpponentItem: call RefreshBattleHuds - callab GetOpponentItem + callfar GetOpponentItem ld a, [hl] ld [wNamedObjectIndexBuffer], a call GetItemName - callab ConsumeHeldItem + callfar ConsumeHeldItem ld hl, RecoveredUsingText jp StdBattleTextBox ; 3ddc8 @@ -4531,7 +4531,7 @@ ItemRecoveryAnim: ; 3ddc8 ; 3dde9 UseHeldStatusHealingItem: ; 3dde9 - callab GetOpponentItem + callfar GetOpponentItem ld hl, .Statuses .loop ld a, [hli] @@ -4600,7 +4600,7 @@ UseConfusionHealingItem: ; 3de51 call GetBattleVar bit SUBSTATUS_CONFUSED, a ret z - callab GetOpponentItem + callfar GetOpponentItem ld a, b cp HELD_HEAL_CONFUSION jr z, .heal_status @@ -4667,7 +4667,7 @@ HandleStatBoostingHeldItems: ; 3de97 push bc ld a, [bc] ld b, a - callab GetItemHeldEffect + callfar GetItemHeldEffect ld hl, .StatUpItems .loop ld a, [hli] @@ -4699,7 +4699,7 @@ HandleStatBoostingHeldItems: ; 3de97 call GetItemName ld hl, BattleText_UsersStringBuffer1Activated call StdBattleTextBox - callab BattleCommand_StatUpMessage + callfar BattleCommand_StatUpMessage ret .finish @@ -4774,7 +4774,7 @@ DrawPlayerHUD: ; 3df58 lb bc, 5, 11 call ClearBox - callba DrawPlayerHUDBorder + farcall DrawPlayerHUDBorder hlcoord 18, 9 ld [hl], $73 ; vertical bar @@ -4867,7 +4867,7 @@ PrintPlayerHUD: ; 3dfbf ld a, TEMPMON ld [MonType], a - callab GetGender + callfar GetGender ld a, " " jr c, .got_gender_char ld a, "♂" @@ -4916,7 +4916,7 @@ DrawEnemyHUD: ; 3e043 lb bc, 4, 11 call ClearBox - callba DrawEnemyHUDBorder + farcall DrawEnemyHUDBorder ld a, [TempEnemyMonSpecies] ld [CurSpecies], a @@ -4945,7 +4945,7 @@ DrawEnemyHUD: ; 3e043 ld a, TEMPMON ld [MonType], a - callab GetGender + callfar GetGender ld a, " " jr c, .got_gender ld a, "♂" @@ -5080,7 +5080,7 @@ BattleMenu: ; 3e139 ld a, [BattleType] cp BATTLETYPE_CONTEST jr nz, .not_contest - callba ContestBattleMenu + farcall ContestBattleMenu jr .next .not_contest @@ -5088,7 +5088,7 @@ BattleMenu: ; 3e139 ld a, [InputType] or a jr z, .skip_dude_pack_select - callba _DudeAutoInput_DownA + farcall _DudeAutoInput_DownA .skip_dude_pack_select call LoadBattleMenu2 ret c @@ -5120,12 +5120,12 @@ LoadBattleMenu2: ; 3e19b call IsMobileBattle jr z, .mobile - callba LoadBattleMenu + farcall LoadBattleMenu and a ret .mobile - callba Function100b12 + farcall Function100b12 ld a, [wcd2b] and a ret z @@ -5159,14 +5159,14 @@ BattleMenu_Pack: ; 3e1c7 cp BATTLETYPE_CONTEST jr z, .contest - callba BattlePack + farcall BattlePack ld a, [wPlayerAction] and a jr z, .didnt_use_item jr .got_item .tutorial - callba TutorialPack + farcall TutorialPack ld a, POKE_BALL ld [CurItem], a call DoItemEffect @@ -5204,7 +5204,7 @@ BattleMenu_Pack: ; 3e1c7 ld a, [wWildMon] and a jr nz, .run - callab CheckItemPocket + callfar CheckItemPocket ld a, [wItemAttributeParamBuffer] cp BALL jr z, .ball @@ -5259,7 +5259,7 @@ BattleMenuPKMN_Loop: call SelectBattleMon jr c, .Cancel .loop - callba FreezeMonIcons + farcall FreezeMonIcons call .GetMenu jr c, .PressedB call PlaceHollowCursor @@ -5298,11 +5298,11 @@ BattleMenuPKMN_Loop: .GetMenu: ; 3e2f5 call IsMobileBattle jr z, .mobile - callba BattleMonMenu + farcall BattleMonMenu ret .mobile - callba MobileBattleMonMenu + farcall MobileBattleMonMenu ret ; 3e308 @@ -5325,7 +5325,7 @@ Battle_StatsScreen: ; 3e308 call LowVolume xor a ; PARTYMON ld [MonType], a - callba BattleStatsScreenInit + farcall BattleStatsScreenInit call MaxVolume call DisableLCD @@ -5434,7 +5434,7 @@ PlayerSwitch: ; 3e3ad ; 3e3ff EnemyMonEntrance: ; 3e3ff - callab AI_Switch + callfar AI_Switch call SetEnemyTurn jp SpikesDamage ; 3e40b @@ -5517,7 +5517,7 @@ BattleMenu_Run: ; 3e489 CheckAmuletCoin: ; 3e4a8 ld a, [BattleMonItem] ld b, a - callab GetItemHeldEffect + callfar GetItemHeldEffect ld a, b cp HELD_AMULET_COIN ret nz @@ -5529,7 +5529,7 @@ CheckAmuletCoin: ; 3e4a8 MoveSelectionScreen: ; 3e4bc call IsMobileBattle jr nz, .not_mobile - callba MobileMoveSelectionScreen + farcall MobileMoveSelectionScreen ret .not_mobile @@ -5884,7 +5884,7 @@ MoveInfoBox: ; 3e6c8 ld [CurPartyMon], a ld a, WILDMON ld [MonType], a - callab GetMaxPPOfMove + callfar GetMaxPPOfMove ld hl, wMenuCursorY ld c, [hl] @@ -5904,7 +5904,7 @@ MoveInfoBox: ; 3e6c8 hlcoord 7, 11 ld [hl], "/" - callab UpdateMoveData + callfar UpdateMoveData ld a, [wPlayerMoveStruct + MOVE_ANIM] ld b, a hlcoord 2, 10 @@ -6104,7 +6104,7 @@ ParseEnemyAction: ; 3e7c1 .skip_load call SetEnemyTurn - callab UpdateMoveData + callfar UpdateMoveData call CheckEnemyLockedIn jr nz, .raging xor a @@ -6167,7 +6167,7 @@ CheckEnemyLockedIn: ; 3e8d1 ; 3e8e4 LinkBattleSendReceiveAction: ; 3e8e4 - callba _LinkBattleSendReceiveAction + farcall _LinkBattleSendReceiveAction ret ; 3e8eb @@ -6276,7 +6276,7 @@ LoadEnemyMon: ; 3e8eb ; All trainers have preset DVs, determined by class ; See GetTrainerDVs for more on that - callba GetTrainerDVs + farcall GetTrainerDVs ; These are the DVs we'll use if we're actually in a trainer battle ld a, [wBattleMode] dec a @@ -6380,7 +6380,7 @@ LoadEnemyMon: ; 3e8eb ; Get Magikarp's length ld de, EnemyMonDVs ld bc, PlayerID - callab CalcMagikarpLength + callfar CalcMagikarpLength ; We're clear if the length is < 1536 ld a, [wMagikarpLength] @@ -6780,7 +6780,7 @@ BattleWinSlideInEnemyTrainerFrontpic: ; 3ebd8 ld a, [OtherTrainerClass] ld [TrainerClass], a ld de, VTiles2 - callab GetTrainerPic + callfar GetTrainerPic hlcoord 19, 0 ld c, 0 @@ -7144,12 +7144,12 @@ BoostStat: ; 3ed7c ; 3ed9f _LoadBattleFontsHPBar: ; 3ed9f - callab LoadBattleFontsHPBar + callfar LoadBattleFontsHPBar ret ; 3eda6 _LoadHPBar: ; 3eda6 - callab LoadHPBar + callfar LoadHPBar ret ; 3edad @@ -7455,7 +7455,7 @@ GiveExperiencePoints: ; 3ee3b call GetBaseData push bc ld d, MAX_LEVEL - callab CalcExpAtLevel + callfar CalcExpAtLevel pop bc ld hl, MON_STAT_EXP - 1 add hl, bc @@ -7484,7 +7484,7 @@ GiveExperiencePoints: ; 3ee3b xor a ; PARTYMON ld [MonType], a predef CopyPkmnToTempMon - callab CalcLevel + callfar CalcLevel pop bc ld hl, MON_LEVEL add hl, bc @@ -7571,16 +7571,16 @@ GiveExperiencePoints: ; 3ee3b xor a ld [wd265], a call ApplyStatLevelMultiplierOnAllStats - callab ApplyStatusEffectOnPlayerStats - callab BadgeStatBoosts - callab UpdatePlayerHUD + callfar ApplyStatusEffectOnPlayerStats + callfar BadgeStatBoosts + callfar UpdatePlayerHUD call EmptyBattleTextBox call LoadTileMapToTempTileMap ld a, $1 ld [hBGMapMode], a .skip_animation - callba LevelUpHappinessMod + farcall LevelUpHappinessMod ld a, [CurBattleMon] ld b, a ld a, [CurPartyMon] @@ -7781,7 +7781,7 @@ AnimateExpBar: ; 3f136 .NoOverflow: ld d, MAX_LEVEL - callab CalcExpAtLevel + callfar CalcExpAtLevel ld a, [hProduct + 1] ld b, a ld a, [hProduct + 2] @@ -7804,7 +7804,7 @@ AnimateExpBar: ; 3f136 ld [hld], a .AlreadyAtMaxExp: - callab CalcLevel + callfar CalcLevel ld a, d pop bc pop de @@ -7836,7 +7836,7 @@ AnimateExpBar: ; 3f136 call TerminateExpBarSound ld de, SFX_HIT_END_OF_EXP_BAR call PlaySFX - callba AnimateEndOfExpBar + farcall AnimateEndOfExpBar call WaitSFX ld hl, BattleText_StringBuffer1GrewToLevel call StdBattleTextBox @@ -8142,7 +8142,7 @@ CalcExpBar: ; 3f39c push de ld d, b push de - callab CalcExpAtLevel + callfar CalcExpAtLevel pop de ; exp at current level gets pushed to the stack ld hl, hMultiplicand @@ -8154,7 +8154,7 @@ CalcExpBar: ; 3f39c push af ; next level inc d - callab CalcExpAtLevel + callfar CalcExpAtLevel ; back up the next level exp, and subtract the two levels ld hl, hMultiplicand + 2 ld a, [hl] @@ -8369,18 +8369,18 @@ _DoBattle: ; 3f4d9 ; 3f4dd BattleIntro: ; 3f4dd - callba TrainerRankings_Battles ; mobile + farcall TrainerRankings_Battles ; mobile call LoadTrainerOrWildMonPic xor a ld [TempBattleMonSpecies], a ld [wBattleMenuCursorBuffer], a xor a ld [hMapAnims], a - callba PlayBattleMusic - callba ShowLinkBattleParticipants - callba FindFirstAliveMonAndStartBattle + farcall PlayBattleMusic + farcall ShowLinkBattleParticipants + farcall FindFirstAliveMonAndStartBattle call DisableSpriteUpdates - callba ClearBattleRAM + farcall ClearBattleRAM call InitEnemy call BackUpVBGMap2 ld b, SCGB_BATTLE_GRAYSCALE @@ -8454,11 +8454,11 @@ BackUpVBGMap2: ; 3f568 InitEnemyTrainer: ; 3f594 ld [TrainerClass], a - callba TrainerRankings_TrainerBattles + farcall TrainerRankings_TrainerBattles xor a ld [TempEnemyMonSpecies], a - callab GetTrainerAttributes - callab ReadTrainerParty + callfar GetTrainerAttributes + callfar ReadTrainerParty ld a, [TrainerClass] cp RIVAL1 @@ -8468,7 +8468,7 @@ InitEnemyTrainer: ; 3f594 .ok ld de, VTiles2 - callab GetTrainerPic + callfar GetTrainerPic xor a ld [hGraphicStartTile], a dec a @@ -8495,7 +8495,7 @@ InitEnemyTrainer: ; 3f594 or [hl] jr z, .skipfaintedmon ld c, HAPPINESS_GYMBATTLE - callab ChangeHappiness + callfar ChangeHappiness .skipfaintedmon pop bc dec b @@ -8510,7 +8510,7 @@ InitEnemyTrainer: ; 3f594 InitEnemyWildmon: ; 3f607 ld a, WILD_BATTLE ld [wBattleMode], a - callba TrainerRankings_WildBattles + farcall TrainerRankings_WildBattles call LoadEnemyMon ld hl, EnemyMonMoves ld de, wWildMonMoves @@ -8619,7 +8619,7 @@ ExitBattle: ; 3f69e xor a ld [wForceEvolution], a predef EvolveAfterBattle - callba GivePokerusAndConvertBerries + farcall GivePokerusAndConvertBerries ret ; 3f6d0 @@ -8693,20 +8693,20 @@ CheckPayDay: ; 3f71d ; 3f759 ShowLinkBattleParticipantsAfterEnd: ; 3f759 - callba TrainerRankings_LinkBattles - callba BackupMobileEventIndex + farcall TrainerRankings_LinkBattles + farcall BackupMobileEventIndex ld a, [CurOTMon] ld hl, OTPartyMon1Status call GetPartyLocation ld a, [EnemyMonStatus] ld [hl], a call ClearTileMap - callba _ShowLinkBattleParticipants + farcall _ShowLinkBattleParticipants ret ; 3f77c DisplayLinkBattleResult: ; 3f77c - callba CheckMobileBattleError + farcall CheckMobileBattleError jp c, .Mobile_InvalidBattle call IsMobileBattle2 jr nz, .proceed @@ -8715,7 +8715,7 @@ DisplayLinkBattleResult: ; 3f77c bit 4, [hl] jr z, .proceed - callba DetermineLinkBattleResult + farcall DetermineLinkBattleResult .proceed ld a, [wBattleResult] @@ -8723,24 +8723,24 @@ DisplayLinkBattleResult: ; 3f77c cp $1 jr c, .victory jr z, .loss - callba TrainerRankings_ColosseumDraws + farcall TrainerRankings_ColosseumDraws ld de, .Draw jr .store_result .victory - callba TrainerRankings_ColosseumWins + farcall TrainerRankings_ColosseumWins ld de, .Win jr .store_result .loss - callba TrainerRankings_ColosseumLosses + farcall TrainerRankings_ColosseumLosses ld de, .Lose jr .store_result .store_result hlcoord 6, 8 call PlaceString - callba BackupMobileEventIndex + farcall BackupMobileEventIndex ld c, 200 call DelayFrames @@ -8977,7 +8977,7 @@ BattleEnd_HandleRoamMons: ; 3f998 ret nz .update_roam_mons - callab UpdateRoamMons + callfar UpdateRoamMons ret ; 3f9d1 @@ -9269,7 +9269,7 @@ InitBattleDisplay: ; 3fb6c ld b, 4 ld c, 18 call TextBox - callba MobileTextBorder + farcall MobileTextBorder hlcoord 1, 5 lb bc, 3, 7 call ClearBox @@ -9285,7 +9285,7 @@ InitBattleDisplay: ; 3fb6c call WaitBGMap xor a ld [hBGMapMode], a - callba BattleIntroSlidingPics + farcall BattleIntroSlidingPics ld a, $1 ld [hBGMapMode], a ld a, $31 @@ -9354,7 +9354,7 @@ GetTrainerBackpic: ; 3fbff jr z, .Chris ; It's a girl. - callba GetKrisBackpic + farcall GetKrisBackpic ret .Chris: @@ -9439,7 +9439,7 @@ BattleStartMessage: ; 3fc8b ld c, 20 call DelayFrames - callba Battle_GetTrainerName + farcall Battle_GetTrainerName ld hl, WantsToBattleText jr .PlaceBattleStartText @@ -9458,10 +9458,10 @@ BattleStartMessage: ; 3fc8b call Call_PlayBattleAnim .not_shiny - callba CheckSleepingTreeMon + farcall CheckSleepingTreeMon jr c, .skip_cry - callba CheckBattleScene + farcall CheckBattleScene jr c, .cry_no_anim hlcoord 12, 0 @@ -9481,7 +9481,7 @@ BattleStartMessage: ; 3fc8b cp BATTLETYPE_FISH jr nz, .NotFishing - callba TrainerRankings_HookedEncounters + farcall TrainerRankings_HookedEncounters ld hl, HookedPokemonAttackedText jr .PlaceBattleStartText @@ -9497,7 +9497,7 @@ BattleStartMessage: ; 3fc8b .PlaceBattleStartText: push hl - callba BattleStart_TrainerHuds + farcall BattleStart_TrainerHuds pop hl call StdBattleTextBox @@ -9505,7 +9505,7 @@ BattleStartMessage: ; 3fc8b ret nz ld c, $2 ; start - callba Mobile_PrintOpponentBattleMessage + farcall Mobile_PrintOpponentBattleMessage ret ; 3fd26 diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 57e4c574f..d04da6b52 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -1016,7 +1016,7 @@ IgnoreSleepOnly: ; 3451f BattleCommand_UsedMoveText: ; 34541 ; usedmovetext - callba DisplayUsedMoveText + farcall DisplayUsedMoveText ret ; 34548 @@ -1385,14 +1385,14 @@ BattleCommand_Stab: ; 346d2 push hl push de push bc - callba DoWeatherModifiers + farcall DoWeatherModifiers pop bc pop de pop hl push de push bc - callba DoBadgeTypeBoosts + farcall DoBadgeTypeBoosts pop bc pop de @@ -3862,7 +3862,7 @@ BattleCommand_Counter: ; 35813 ret z ld b, a - callab GetMoveEffect + callfar GetMoveEffect ld a, b cp EFFECT_COUNTER ret z @@ -4068,7 +4068,7 @@ BattleCommand_PainSplit: ; 35926 call ResetDamage hlcoord 2, 2 predef AnimateHPBar - callba _UpdateBattleHUDs + farcall _UpdateBattleHUDs ld hl, SharedPainText jp StdBattleTextBox @@ -4518,7 +4518,7 @@ BattleCommand_SleepTalk: ; 35b33 push bc ld b, a - callab GetMoveEffect + callfar GetMoveEffect ld a, b pop bc @@ -4747,7 +4747,7 @@ PlayFXAnimID: ; 35d08 ld c, 3 call DelayFrames - callab PlayBattleAnim + callfar PlayBattleAnim ret @@ -5017,7 +5017,7 @@ BattleCommand_SleepTarget: ; 35e5c ld hl, FellAsleepText call StdBattleTextBox - callba UseHeldStatusHealingItem + farcall UseHeldStatusHealingItem jp z, OpponentCantMove ret @@ -5094,7 +5094,7 @@ BattleCommand_PoisonTarget: ; 35eee ld hl, WasPoisonedText call StdBattleTextBox - callba UseHeldStatusHealingItem + farcall UseHeldStatusHealingItem ret ; 35f2c @@ -5179,7 +5179,7 @@ BattleCommand_Poison: ; 35f2c call StdBattleTextBox .finished - callba UseHeldStatusHealingItem + farcall UseHeldStatusHealingItem ret .failed @@ -5382,7 +5382,7 @@ BattleCommand_BurnTarget: ; 3608c ld hl, WasBurnedText call StdBattleTextBox - callba UseHeldStatusHealingItem + farcall UseHeldStatusHealingItem ret ; 360dd @@ -5455,7 +5455,7 @@ BattleCommand_FreezeTarget: ; 36102 ld hl, WasFrozenText call StdBattleTextBox - callba UseHeldStatusHealingItem + farcall UseHeldStatusHealingItem ret nz call OpponentCantMove @@ -6816,7 +6816,7 @@ BattleCommand_ForceSwitch: ; 3680f ld a, d inc a ld [wEnemySwitchMonIndex], a - callab ForceEnemySwitch + callfar ForceEnemySwitch ld hl, DraggedOutText call StdBattleTextBox @@ -8081,7 +8081,7 @@ BattleCommand_LeechSeed: ; 36f9d BattleCommand_Splash: ; 36fe1 call AnimateCurrentMove - callba TrainerRankings_Splash + farcall TrainerRankings_Splash jp PrintNothingHappened ; 36fed @@ -8285,7 +8285,7 @@ BattleCommand_Conversion: ; 3707f inc de ld [de], a ld [wNamedObjectIndexBuffer], a - callba GetTypeName + farcall GetTypeName call AnimateCurrentMove ld hl, TransformedTypeText jp StdBattleTextBox @@ -8608,7 +8608,7 @@ CheckSubstituteOpp: ; 37378 BattleCommand_Selfdestruct: ; 37380 - callba TrainerRankings_Selfdestruct + farcall TrainerRankings_Selfdestruct ld a, BATTLEANIM_PLAYER_DAMAGE ld [wNumHits], a ld c, 3 @@ -8632,8 +8632,8 @@ BattleCommand_Selfdestruct: ; 37380 res SUBSTATUS_DESTINY_BOND, [hl] call _CheckBattleScene ret nc - callba DrawPlayerHUD - callba DrawEnemyHUD + farcall DrawPlayerHUD + farcall DrawEnemyHUD call WaitBGMap jp RefreshBattleHuds @@ -9032,13 +9032,13 @@ BattleCommand_BatonPass: ; 379c9 ; Transition into switchmon menu call LoadStandardMenuDataHeader - callba SetUpBattlePartyMenu_NoLoop + farcall SetUpBattlePartyMenu_NoLoop - callba ForcePickSwitchMonInBattle + farcall ForcePickSwitchMonInBattle ; Return to battle scene call ClearPalettes - callba _LoadBattleFontsHPBar + farcall _LoadBattleFontsHPBar call CloseWindow call ClearSprites hlcoord 1, 0 @@ -9050,7 +9050,7 @@ BattleCommand_BatonPass: ; 379c9 call BatonPass_LinkPlayerSwitch ; Mobile link battles handle entrances differently - callba CheckMobileBattleError + farcall CheckMobileBattleError jp c, EndMoveEffect ld hl, PassedBattleMonEntrance @@ -9075,7 +9075,7 @@ BattleCommand_BatonPass: ; 379c9 call BatonPass_LinkEnemySwitch ; Mobile link battles handle entrances differently - callba CheckMobileBattleError + farcall CheckMobileBattleError jp c, EndMoveEffect ; Passed enemy PartyMon entrance @@ -9403,7 +9403,7 @@ BattleCommand_TimeBasedHealContinue: ; 37b7e call AnimateCurrentMove call BattleCommand_SwitchTurn - callab RestoreHP + callfar RestoreHP call BattleCommand_SwitchTurn call UpdateUserInParty @@ -9433,7 +9433,7 @@ BattleCommand_HiddenPower: ; 37be8 ld a, [AttackMissed] and a ret nz - callba HiddenPowerDamage + farcall HiddenPowerDamage ret ; 37bf4 @@ -9475,14 +9475,14 @@ BattleCommand_BellyDrum: ; 37c1a and a jr nz, .failed - callab GetHalfMaxHP - callab CheckUserHasEnoughHP + callfar GetHalfMaxHP + callfar CheckUserHasEnoughHP jr nc, .failed push bc call AnimateCurrentMove pop bc - callab SubtractHPFromUser + callfar SubtractHPFromUser call UpdateUserInParty ld a, 5 @@ -9568,7 +9568,7 @@ BattleCommand_MirrorCoat: ; 37c95 ret z ld b, a - callab GetMoveEffect + callfar GetMoveEffect ld a, b cp EFFECT_MIRROR_COAT ret z @@ -9914,7 +9914,7 @@ PlayUserBattleAnim: ; 37e47 push hl push de push bc - callab PlayBattleAnim + callfar PlayBattleAnim pop bc pop de pop hl @@ -9936,7 +9936,7 @@ PlayOpponentBattleAnim: ; 37e54 push bc call BattleCommand_SwitchTurn - callab PlayBattleAnim + callfar PlayBattleAnim call BattleCommand_SwitchTurn pop bc @@ -10035,21 +10035,21 @@ GetMoveByte: ; 37ebb DisappearUser: ; 37ec0 - callba _DisappearUser + farcall _DisappearUser ret ; 37ec7 AppearUserLowerSub: ; 37ec7 - callba _AppearUserLowerSub + farcall _AppearUserLowerSub ret ; 37ece AppearUserRaiseSub: ; 37ece - callba _AppearUserRaiseSub + farcall _AppearUserRaiseSub ret ; 37ed5 @@ -10060,7 +10060,7 @@ _CheckBattleScene: ; 37ed5 push hl push de push bc - callba CheckBattleScene + farcall CheckBattleScene pop bc pop de pop hl diff --git a/battle/effects/attract.asm b/battle/effects/attract.asm index f1bc590eb..0a6d7c975 100755 --- a/battle/effects/attract.asm +++ b/battle/effects/attract.asm @@ -35,7 +35,7 @@ CheckOppositeGender: ; 377f5 xor a ld [MonType], a - callba GetGender + farcall GetGender jr c, .genderless_samegender ld b, 1 @@ -58,7 +58,7 @@ CheckOppositeGender: ; 377f5 ld [TempMonDVs + 1], a ld a, 3 ld [MonType], a - callba GetGender + farcall GetGender pop bc jr c, .genderless_samegender diff --git a/battle/effects/thief.asm b/battle/effects/thief.asm index f344edef9..6d32d68d4 100644 --- a/battle/effects/thief.asm +++ b/battle/effects/thief.asm @@ -23,7 +23,7 @@ BattleCommand_Thief: ; 37492 ld [wd265], a ld d, a - callba ItemIsMail + farcall ItemIsMail ret c ld a, [EffectFailed] @@ -71,7 +71,7 @@ BattleCommand_Thief: ; 37492 ld [wd265], a ld d, a - callba ItemIsMail + farcall ItemIsMail ret c ld a, [EffectFailed] diff --git a/battle/hidden_power.asm b/battle/hidden_power.asm index 184c597d0..c75a67ab3 100644 --- a/battle/hidden_power.asm +++ b/battle/hidden_power.asm @@ -104,7 +104,7 @@ HiddenPowerDamage: ; fbced ; based on the new type, but keep base power. ld a, d push af - callba BattleCommand_DamageStats ; damagestats + farcall BattleCommand_DamageStats ; damagestats pop af ld d, a ret diff --git a/battle/link_result.asm b/battle/link_result.asm index 5739bbdc0..cf6102acc 100755 --- a/battle/link_result.asm +++ b/battle/link_result.asm @@ -1,5 +1,5 @@ DetermineLinkBattleResult: ; 2b930 - callba UpdateEnemyMonInParty + farcall UpdateEnemyMonInParty ld hl, PartyMon1HP call .CountMonsRemaining push bc diff --git a/battle/misc.asm b/battle/misc.asm index 0fed74e38..b05dc8071 100644 --- a/battle/misc.asm +++ b/battle/misc.asm @@ -13,11 +13,11 @@ _DisappearUser: ; fbd54 jr FinishAppearDisappearUser _AppearUserRaiseSub: ; fbd69 (3e:7d69) - callba BattleCommand_RaiseSubNoAnim + farcall BattleCommand_RaiseSubNoAnim jr AppearUser _AppearUserLowerSub: ; fbd71 (3e:7d71) - callba BattleCommand_LowerSubNoAnim + farcall BattleCommand_LowerSubNoAnim AppearUser: ; fbd77 (3e:7d77) xor a diff --git a/battle/objects/engine.asm b/battle/objects/engine.asm index 9e6c3329a..6a4f86902 100755 --- a/battle/objects/engine.asm +++ b/battle/objects/engine.asm @@ -302,13 +302,13 @@ GetBattleAnimTileOffset: ; ccb31 (33:4b31) ret _ExecuteBGEffects: ; ccb48 - callab ExecuteBGEffects + callfar ExecuteBGEffects ret ; ccb4f _QueueBGEffect: ; ccb4f (33:4b4f) - callab QueueBGEffect + callfar QueueBGEffect ret ; ccb56 (33:4b56) diff --git a/battle/trainer_huds.asm b/battle/trainer_huds.asm index 60be946fa..9efe08414 100755 --- a/battle/trainer_huds.asm +++ b/battle/trainer_huds.asm @@ -259,7 +259,7 @@ _ShowLinkBattleParticipants: ; 2c1b2 ld a, "" ld [hli], a ld [hl], "" - callba LinkBattle_TrainerHuds ; no need to callba + farcall LinkBattle_TrainerHuds ; no need to farcall ld b, SCGB_DIPLOMA call GetSGBLayout call SetPalettes diff --git a/battle/used_move_text.asm b/battle/used_move_text.asm index 5b7fcef1a..ea2351005 100755 --- a/battle/used_move_text.asm +++ b/battle/used_move_text.asm @@ -32,7 +32,7 @@ UsedMoveText: ; 105db9 ld [wd265], a push hl - callba CheckUserIsCharging + farcall CheckUserIsCharging pop hl jr nz, .grammar diff --git a/data/items/item_descriptions.asm b/data/items/item_descriptions.asm index 40e91b2c9..e5b01e8fd 100644 --- a/data/items/item_descriptions.asm +++ b/data/items/item_descriptions.asm @@ -7,7 +7,7 @@ PrintItemDescription: ; 0x1c8955 ld [CurItem], a push de - callba GetTMHMItemMove + farcall GetTMHMItemMove pop hl ld a, [wd265] ld [CurSpecies], a diff --git a/engine/anim_hp_bar.asm b/engine/anim_hp_bar.asm index a26c40b91..78062b547 100755 --- a/engine/anim_hp_bar.asm +++ b/engine/anim_hp_bar.asm @@ -293,7 +293,7 @@ HPBarAnim_PaletteUpdate: ; d7b4 call SetHPPal ld a, [wCurHPAnimPal] ld c, a - callba ApplyHPBarPals + farcall ApplyHPBarPals ret ; d7c9 diff --git a/engine/battle_transition.asm b/engine/battle_transition.asm index f8756649b..194f7998b 100644 --- a/engine/battle_transition.asm +++ b/engine/battle_transition.asm @@ -56,7 +56,7 @@ Predef_StartBattle: ; 8c20f ld a, [wLinkMode] cp LINK_MOBILE jr z, .mobile - callba ReanchorBGMap_NoOAMUpdate + farcall ReanchorBGMap_NoOAMUpdate call UpdateSprites call DelayFrame call .NonMobile_LoadPokeballTiles @@ -297,7 +297,7 @@ StartTrainerBattle_Flash: ; 8c3ab (23:43ab) ; 8c3e8 StartTrainerBattle_SetUpForWavyOutro: ; 8c3e8 (23:43e8) - callba Function5602 + farcall Function5602 ld a, $5 ; BANK(LYOverrides) ld [rSVBK], a @@ -355,7 +355,7 @@ StartTrainerBattle_SineWave: ; 8c408 (23:4408) ret StartTrainerBattle_SetUpForSpinOutro: ; 8c43d (23:443d) - callba Function5602 + farcall Function5602 ld a, $5 ; BANK(LYOverrides) ld [rSVBK], a call StartTrainerBattle_NextScene @@ -497,7 +497,7 @@ ENDM ; 8c578 StartTrainerBattle_SetUpForRandomScatterOutro: ; 8c578 (23:4578) - callba Function5602 + farcall Function5602 ld a, $5 ; BANK(LYOverrides) ld [rSVBK], a call StartTrainerBattle_NextScene @@ -797,7 +797,7 @@ StartTrainerBattle_DrawSineWave: ; 8c6f7 (23:46f7) ; 8c768 StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768) - callba Function5602 + farcall Function5602 ld de, .boxes .loop diff --git a/engine/billspc.asm b/engine/billspc.asm index 9595bffc6..0bdacf436 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -208,7 +208,7 @@ BillsPCDepositFuncRelease: ; e24e0 (38:64e0) ld [CurPartyMon], a xor a ld [wPokemonWithdrawDepositParameter], a - callba RemoveMonFromPartyOrBox + farcall RemoveMonFromPartyOrBox call ReleasePKMN_ByePKMN ld a, $0 ld [wJumptableIndex], a @@ -472,7 +472,7 @@ BillsPC_Withdraw: ; e2675 (38:6675) ld [CurPartyMon], a ld a, PC_DEPOSIT ld [wPokemonWithdrawDepositParameter], a - callba RemoveMonFromPartyOrBox + farcall RemoveMonFromPartyOrBox call ReleasePKMN_ByePKMN ld a, $0 ld [wJumptableIndex], a @@ -1125,7 +1125,7 @@ PCMonInfo: ; e2ac6 (38:6ac6) ld a, $3 ld [MonType], a - callba GetGender + farcall GetGender jr c, .skip_gender ld a, "♂" jr nz, .printgender @@ -1140,7 +1140,7 @@ PCMonInfo: ; e2ac6 (38:6ac6) ret z ld d, a - callab ItemIsMail + callfar ItemIsMail jr c, .mail ld a, $5d ; item icon jr .printitem @@ -1656,7 +1656,7 @@ BillsPC_CheckMail_PreventBlackout: ; e2f18 (38:6f18) ld hl, wBillsPC_ScrollPosition add [hl] ld [CurPartyMon], a - callba CheckCurPartyMonFainted + farcall CheckCurPartyMonFainted jr c, .AllOthersFainted ld a, [wBillsPC_MonHasMail] and a @@ -1773,7 +1773,7 @@ BillsPC_CopyMon: ; e2fd6 (38:6fd6) ld bc, PARTYMON_STRUCT_LENGTH call CopyBytes call CloseSRAM - callba CalcwBufferMonStats + farcall CalcwBufferMonStats ret .party @@ -1816,7 +1816,7 @@ BillsPC_CopyMon: ; e2fd6 (38:6fd6) ld bc, BOXMON_STRUCT_LENGTH call CopyMonToTemp call CloseSRAM - callba CalcwBufferMonStats + farcall CalcwBufferMonStats ret DepositPokemon: ; e307c (38:707c) @@ -1833,7 +1833,7 @@ DepositPokemon: ; e307c (38:707c) jr c, .asm_boxisfull xor a ld [wPokemonWithdrawDepositParameter], a - callba RemoveMonFromPartyOrBox + farcall RemoveMonFromPartyOrBox ld a, [CurPartySpecies] call PlayCry hlcoord 0, 0 @@ -1888,7 +1888,7 @@ TryWithdrawPokemon: ; e30fa (38:70fa) jr c, .PartyFull ld a, PC_DEPOSIT ld [wPokemonWithdrawDepositParameter], a - callba RemoveMonFromPartyOrBox + farcall RemoveMonFromPartyOrBox ld a, [CurPartySpecies] call PlayCry hlcoord 0, 0 @@ -2020,7 +2020,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 .dw_return ; e322a pop af ld e, a - callba MovePkmnWOMail_InsertMon_SaveGame + farcall MovePkmnWOMail_InsertMon_SaveGame ret ; e3233 @@ -2056,7 +2056,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 call .CopyFromParty ld a, $1 ld [wGameLogicPaused], a - callba SaveGameData + farcall SaveGameData xor a ld [wGameLogicPaused], a call .CopyToBox @@ -2106,7 +2106,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 ld a, [wBillsPC_BackupLoadedBox] dec a ld e, a - callba MovePkmnWOMail_SaveGame + farcall MovePkmnWOMail_SaveGame ld a, [wBillsPC_BackupCursorPosition] ld hl, wBillsPC_BackupScrollPosition add [hl] @@ -2123,10 +2123,10 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 ld bc, BOXMON_STRUCT_LENGTH call CopyMonToTemp call CloseSRAM - callba CalcwBufferMonStats + farcall CalcwBufferMonStats ld a, PC_DEPOSIT ld [wPokemonWithdrawDepositParameter], a - callba RemoveMonFromPartyOrBox + farcall RemoveMonFromPartyOrBox ret ; e32fa @@ -2134,12 +2134,12 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 ld a, [wBillsPC_LoadedBox] dec a ld e, a - callba MovePkmnWOMail_SaveGame + farcall MovePkmnWOMail_SaveGame ld a, [wBillsPC_CursorPosition] ld hl, wBillsPC_ScrollPosition add [hl] ld [CurPartyMon], a - callba InsertPokemonIntoBox + farcall InsertPokemonIntoBox ret ; e3316 @@ -2159,7 +2159,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 call CopyMonToTemp xor a ld [wPokemonWithdrawDepositParameter], a - callba RemoveMonFromPartyOrBox + farcall RemoveMonFromPartyOrBox ret ; e3346 @@ -2168,7 +2168,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 ld hl, wBillsPC_ScrollPosition add [hl] ld [CurPartyMon], a - callba InsertPokemonIntoParty + farcall InsertPokemonIntoParty ret ; e3357 @@ -2523,7 +2523,7 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9) ld a, [MenuSelection] dec a ld c, a - callba PrintPCBox + farcall PrintPCBox call BillsPC_ClearTilemap and a ret @@ -2540,13 +2540,13 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9) ld a, [wCurBox] cp e ret z - callba ChangeBoxSaveGame + farcall ChangeBoxSaveGame ret .Name: ld b, $4 ; box ld de, wd002 - callba NamingScreen + farcall NamingScreen call ClearTileMap call LoadStandardFont call LoadFontsBattleExtra diff --git a/engine/billspctop.asm b/engine/billspctop.asm index eda83c28e..c36cbe45d 100755 --- a/engine/billspctop.asm +++ b/engine/billspctop.asm @@ -111,16 +111,16 @@ BillsPC_SeeYa: ; e4cb BillsPC_MovePKMNMenu: ; e4cd call LoadStandardMenuDataHeader - callba IsAnyMonHoldingMail + farcall IsAnyMonHoldingMail jr nc, .no_mail ld hl, .Text_MonHoldingMail call PrintText jr .quit .no_mail - callba StartMovePkmnWOMail_SaveGame + farcall StartMovePkmnWOMail_SaveGame jr c, .quit - callba _MovePKMNWithoutMail + farcall _MovePKMNWithoutMail call ReturnToMapFromSubmenu call ClearPCItemScreen @@ -136,7 +136,7 @@ BillsPC_MovePKMNMenu: ; e4cd BillsPC_DepositMenu: ; e4fe (3:64fe) call LoadStandardMenuDataHeader - callba _DepositPKMN + farcall _DepositPKMN call ReturnToMapFromSubmenu call ClearPCItemScreen call CloseWindow @@ -205,7 +205,7 @@ CheckCurPartyMonFainted: ; e538 BillsPC_WithdrawMenu: ; e559 (3:6559) call LoadStandardMenuDataHeader - callba _WithdrawPKMN + farcall _WithdrawPKMN call ReturnToMapFromSubmenu call ClearPCItemScreen call CloseWindow @@ -231,7 +231,7 @@ UnknownText_0xe57e: ; 0xe57e db "@" BillsPC_ChangeBoxMenu: ; e583 (3:6583) - callba _ChangeBox + farcall _ChangeBox and a ret diff --git a/engine/breeding.asm b/engine/breeding.asm index b402f99f1..517908902 100755 --- a/engine/breeding.asm +++ b/engine/breeding.asm @@ -231,8 +231,8 @@ HatchEggs: ; 16f70 (5:6f70) push de - callba SetEggMonCaughtData - callba TrainerRankings_EggsHatched + farcall SetEggMonCaughtData + farcall TrainerRankings_EggsHatched ld a, [CurPartyMon] ld hl, PartyMon1Species ld bc, PARTYMON_STRUCT_LENGTH @@ -337,7 +337,7 @@ HatchEggs: ; 16f70 (5:6f70) ld [MonType], a push de ld b, $0 - callba NamingScreen + farcall NamingScreen pop hl ld de, StringBuffer1 call InitName @@ -687,7 +687,7 @@ EggHatch_DoAnimFrame: ; 1727f (5:727f) push hl push de push bc - callab PlaySpriteAnimations + callfar PlaySpriteAnimations call DelayFrame pop bc pop de @@ -701,14 +701,14 @@ EggHatch_AnimationSequence: ; 1728f (5:728f) push af ld de, MUSIC_NONE call PlayMusic - callba BlankScreen + farcall BlankScreen call DisableLCD ld hl, EggHatchGFX ld de, VTiles0 tile $00 ld bc, $20 ld a, BANK(EggHatchGFX) call FarCopyBytes - callba ClearSpriteAnims + farcall ClearSpriteAnims ld de, VTiles2 tile $00 ld a, [wJumptableIndex] call GetHatchlingFrontpic @@ -817,7 +817,7 @@ INCBIN "gfx/evo/egg_hatch.2bpp" ; 173b3 Hatch_InitShellFragments: ; 173b3 (5:73b3) - callba ClearSpriteAnims + farcall ClearSpriteAnims ld hl, .SpriteData .loop ld a, [hli] diff --git a/engine/buy_sell_toss.asm b/engine/buy_sell_toss.asm index bd18cc83a..37bee86b1 100755 --- a/engine/buy_sell_toss.asm +++ b/engine/buy_sell_toss.asm @@ -6,7 +6,7 @@ SelectQuantityToToss: ; 24fbf ; 24fc9 SelectQuantityToBuy: ; 24fc9 - callba GetItemPrice + farcall GetItemPrice RooftopSale_SelectQuantityToBuy: ; 24fcf ld a, d ld [Buffer1], a @@ -19,7 +19,7 @@ RooftopSale_SelectQuantityToBuy: ; 24fcf ; 24fe1 SelectQuantityToSell: ; 24fe1 - callba GetItemPrice + farcall GetItemPrice ld a, d ld [Buffer1], a ld a, e diff --git a/engine/caught_data.asm b/engine/caught_data.asm index c079009ae..961782908 100644 --- a/engine/caught_data.asm +++ b/engine/caught_data.asm @@ -52,7 +52,7 @@ CheckPartyFullAfterContest: ; 4d9e5 xor a ld [MonType], a ld de, wMonOrItemNameBuffer - callab InitNickname + callfar InitNickname .Party_SkipNickname: ld a, [PartyCount] @@ -103,7 +103,7 @@ CheckPartyFullAfterContest: ; 4d9e5 ld de, wBufferMonOT ld bc, NAME_LENGTH call CopyBytes - callab InsertPokemonIntoBox + callfar InsertPokemonIntoBox ld a, [CurPartySpecies] ld [wd265], a call GetPokemonName @@ -113,7 +113,7 @@ CheckPartyFullAfterContest: ; 4d9e5 ld a, BOXMON ld [MonType], a ld de, wMonOrItemNameBuffer - callab InitNickname + callfar InitNickname ld hl, wMonOrItemNameBuffer .Box_SkipNickname: diff --git a/engine/cgb_layouts.asm b/engine/cgb_layouts.asm index 18fda6170..05834d35f 100644 --- a/engine/cgb_layouts.asm +++ b/engine/cgb_layouts.asm @@ -156,7 +156,7 @@ _CGB_FinishBattleScreenLayout: ; 8e23 InitPartyMenuBGPal7: ; 8e85 - callba Function100dc0 + farcall Function100dc0 Mobile_InitPartyMenuBGPal7: ; 8e8b ld hl, Palette_b311 jr nc, .not_mobile @@ -170,7 +170,7 @@ Mobile_InitPartyMenuBGPal7: ; 8e8b ; 8e9f InitPartyMenuBGPal0: ; 8e9f - callba Function100dc0 + farcall Function100dc0 ld hl, Palette_b311 jr nc, .not_mobile ld hl, Palette_b309 diff --git a/engine/clock_reset.asm b/engine/clock_reset.asm index 7b1d84302..c81271442 100755 --- a/engine/clock_reset.asm +++ b/engine/clock_reset.asm @@ -202,13 +202,13 @@ RestartClock: ; 20021 (8:4021) decoord 1, 8 ld a, [Buffer4] ld b, a - callba PrintDayOfWeek + farcall PrintDayOfWeek ld a, [Buffer5] ld b, a ld a, [Buffer6] ld c, a decoord 11, 8 - callba PrintHoursMins + farcall PrintHoursMins ld a, [Buffer2] lb de, " ", " " call .PlaceChars diff --git a/engine/color.asm b/engine/color.asm index 12f22d4c1..e360f101d 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -691,7 +691,7 @@ InitPartyMenuOBPals: GetBattlemonBackpicPalettePointer: push de - callba GetPartyMonDVs + farcall GetPartyMonDVs ld c, l ld b, h ld a, [TempBattleMonSpecies] @@ -701,7 +701,7 @@ GetBattlemonBackpicPalettePointer: GetEnemyFrontpicPalettePointer: push de - callba GetEnemyMonDVs + farcall GetEnemyMonDVs ld c, l ld b, h ld a, [TempEnemyMonSpecies] @@ -1306,7 +1306,7 @@ INCLUDE "gfx/pics/palette_pointers.asm" INCLUDE "gfx/trainer_palettes.asm" LoadMapPals: - callba LoadSpecialMapPalette + farcall LoadSpecialMapPalette jr c, .got_pals ; Which palette group is based on whether we're outside or inside diff --git a/engine/consume_held_item.asm b/engine/consume_held_item.asm index 52d7894cd..a6f7766fb 100644 --- a/engine/consume_held_item.asm +++ b/engine/consume_held_item.asm @@ -17,7 +17,7 @@ ConsumeHeldItem: ; 27192 push af ld a, [de] ld b, a - callba GetItemHeldEffect + farcall GetItemHeldEffect ld hl, .ConsumableEffects .loop ld a, [hli] diff --git a/engine/crystal_colors.asm b/engine/crystal_colors.asm index f8c1a6781..43841a201 100755 --- a/engine/crystal_colors.asm +++ b/engine/crystal_colors.asm @@ -5,7 +5,7 @@ GetMysteryGift_MobileAdapterLayout: ; 4930f (mobile) ld a, [SGBPredef] .not_ram push af - callba ResetBGPals + farcall ResetBGPals pop af ld l, a ld h, 0 @@ -70,8 +70,8 @@ MG_Mobile_Layout00: ; 4936e (12:536e) call MG_Mobile_Layout_LoadPals call MG_Mobile_Layout_WipeAttrMap call MG_Mobile_Layout_CreatePalBoxes - callba ApplyAttrMap - callba ApplyPals + farcall ApplyAttrMap + farcall ApplyPals ret MG_Mobile_Layout_CreatePalBoxes: ; 49384 (12:5384) @@ -167,8 +167,8 @@ MG_Mobile_Layout01: ; 4942f call Function49496 .asm_49467 - callba ApplyAttrMap - callba ApplyPals + farcall ApplyAttrMap + farcall ApplyPals ld a, $1 ld [hCGBPalUpdate], a ret @@ -215,9 +215,9 @@ MG_Mobile_Layout02: ; 49706 ld bc, 1 palettes ld a, BANK(UnknBGPals) call FarCopyWRAM - callba ApplyPals + farcall ApplyPals call MG_Mobile_Layout_WipeAttrMap - callba ApplyAttrMap + farcall ApplyAttrMap ld hl, Palette_4973a ld de, UnknOBPals ld bc, 1 palettes @@ -246,7 +246,7 @@ Function49742: ; 49742 ld bc, $40 ld a, $5 call FarCopyWRAM - callba ApplyPals + farcall ApplyPals ret ; 49757 @@ -312,7 +312,7 @@ LoadTradeRoomBGPals: ; 49811 ld bc, 6 palettes ld a, BANK(UnknBGPals) call FarCopyWRAM - callba ApplyPals + farcall ApplyPals ret ; 49826 diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index b417044eb..52b07331e 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -18,12 +18,12 @@ Copyright_GFPresents: ; e4579 call SetPalettes ld c, 10 call DelayFrames - callab Copyright + callfar Copyright call WaitBGMap ld c, 100 call DelayFrames call ClearTileMap - callba GBCOnlyScreen + farcall GBCOnlyScreen call .GetGFLogoGFX .joy_loop call JoyTextDelay @@ -34,7 +34,7 @@ Copyright_GFPresents: ; e4579 bit 7, a jr nz, .finish call PlaceGameFreakPresents - callba PlaySpriteAnimations + farcall PlaySpriteAnimations call DelayFrame jr .joy_loop @@ -78,7 +78,7 @@ Copyright_GFPresents: ; e4579 pop af ld [rSVBK], a - callba ClearSpriteAnims + farcall ClearSpriteAnims depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_GAMEFREAK_LOGO call _InitSpriteAnimStruct @@ -107,7 +107,7 @@ Copyright_GFPresents: ; e4579 ; e465e .StopGamefreakAnim: ; e465e - callba ClearSpriteAnims + farcall ClearSpriteAnims call ClearTileMap call ClearSprites ld c, 16 @@ -253,7 +253,7 @@ GameFreakLogoScene2: ; e470d (39:470d) add $20 .asm_e4723 ld e, a - callba BattleAnim_Sine_e + farcall BattleAnim_Sine_e ld hl, SPRITEANIMSTRUCT_YOFFSET add hl, bc ld [hl], e @@ -368,7 +368,7 @@ CrystalIntro: ; e48ac bit 7, a jr nz, .done call IntroSceneJumper - callba PlaySpriteAnimations + farcall PlaySpriteAnimations call DelayFrame jp .loop @@ -499,7 +499,7 @@ IntroScene1: ; e495b (39:495b) ld [hWX], a ld a, $90 ld [hWY], a - callba ClearSpriteAnims + farcall ClearSpriteAnims call Intro_SetCGBPalUpdate xor a ld [wIntroSceneFrameCounter], a @@ -638,7 +638,7 @@ IntroScene5: ; e4a7a (39:4a7a) ld [hWX], a ld a, $90 ld [hWY], a - callba ClearSpriteAnims + farcall ClearSpriteAnims call Intro_SetCGBPalUpdate xor a ld [wIntroSceneFrameCounter], a @@ -749,7 +749,7 @@ IntroScene7: ; e4b3f (39:4b3f) ld a, $90 ld [hWY], a call Intro_ResetLYOverrides - callba ClearSpriteAnims + farcall ClearSpriteAnims depixel 13, 27, 4, 0 ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE call _InitSpriteAnimStruct @@ -787,7 +787,7 @@ IntroScene8: ; e4bd3 (39:4bd3) .finish ld de, SFX_INTRO_SUICUNE_2 call PlaySFX - callba DeinitializeAllSprites + farcall DeinitializeAllSprites call NextIntroScene ret @@ -903,7 +903,7 @@ IntroScene11: ; e4c86 (39:4c86) ld [hWX], a ld a, $90 ld [hWY], a - callba ClearSpriteAnims + farcall ClearSpriteAnims call Intro_SetCGBPalUpdate xor a ld [wIntroSceneFrameCounter], a @@ -1030,7 +1030,7 @@ IntroScene13: ; e4d6d (39:4d6d) ld [hWX], a ld a, $90 ld [hWY], a - callba ClearSpriteAnims + farcall ClearSpriteAnims depixel 13, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE call _InitSpriteAnimStruct @@ -1077,7 +1077,7 @@ IntroScene14: ; e4dfa (39:4dfa) ret .asm_e4e2c - callba DeinitializeAllSprites + farcall DeinitializeAllSprites ret .asm_e4e33 @@ -1140,7 +1140,7 @@ IntroScene15: ; e4e40 (39:4e40) ld [hWX], a ld a, $90 ld [hWY], a - callba ClearSpriteAnims + farcall ClearSpriteAnims call Intro_SetCGBPalUpdate depixel 8, 5 ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN_F @@ -1213,7 +1213,7 @@ IntroScene17: ; e4ef5 (39:4ef5) ld [hWX], a ld a, $90 ld [hWY], a - callba ClearSpriteAnims + farcall ClearSpriteAnims call Intro_SetCGBPalUpdate xor a ld [wIntroSceneFrameCounter], a @@ -1288,7 +1288,7 @@ IntroScene19: ; e4f7e (39:4f7e) ld [hWX], a ld a, $90 ld [hWY], a - callba ClearSpriteAnims + farcall ClearSpriteAnims ld hl, wSpriteAnimDict xor a ld [hli], a @@ -1370,7 +1370,7 @@ IntroScene22: ; e5072 (39:5072) jr nc, .done ret .done - callba DeinitializeAllSprites + farcall DeinitializeAllSprites call NextIntroScene ret @@ -1457,7 +1457,7 @@ IntroScene26: ; e50bb (39:50bb) ld [hWX], a ld a, $90 ld [hWY], a - callba ClearSpriteAnims + farcall ClearSpriteAnims call Intro_SetCGBPalUpdate xor a ld [wIntroSceneFrameCounter], a diff --git a/engine/debug.asm b/engine/debug.asm index bcd53c021..65f2cfb36 100755 --- a/engine/debug.asm +++ b/engine/debug.asm @@ -341,12 +341,12 @@ Function81adb: ; 81adb .asm_81b7a ld a, [wd265] ld [TrainerClass], a - callab GetTrainerAttributes + callfar GetTrainerAttributes ld de, StringBuffer1 hlcoord 4, 1 call PlaceString ld de, VTiles2 - callab GetTrainerPic + callfar GetTrainerPic xor a ld [TempEnemyMonSpecies], a ld [hGraphicStartTile], a diff --git a/engine/decorations.asm b/engine/decorations.asm index 160022b93..1e9effe97 100755 --- a/engine/decorations.asm +++ b/engine/decorations.asm @@ -1368,7 +1368,7 @@ _GetDecorationSprite: ; 27085 ld c, a push de push hl - callba GetDecorationSprite + farcall GetDecorationSprite pop hl pop de ld a, c diff --git a/engine/delete_save_change_clock.asm b/engine/delete_save_change_clock.asm index 782b95425..e77874e1c 100755 --- a/engine/delete_save_change_clock.asm +++ b/engine/delete_save_change_clock.asm @@ -1,5 +1,5 @@ _ResetClock: ; 4d3b1 - callba BlankScreen + farcall BlankScreen ld b, SCGB_DIPLOMA call GetSGBLayout call LoadStandardFont @@ -260,7 +260,7 @@ ClockResetPassword: ; 4d41e ret _DeleteSaveData: ; 4d54c - callba BlankScreen + farcall BlankScreen ld b, SCGB_DIPLOMA call GetSGBLayout call LoadStandardFont @@ -276,7 +276,7 @@ _DeleteSaveData: ; 4d54c ld a, [wMenuCursorY] cp $1 ret z - callba EmptyAllSRAMBanks + farcall EmptyAllSRAMBanks ret .Text_ClearAllSaveData: ; 0x4d580 diff --git a/engine/dummy_game.asm b/engine/dummy_game.asm index 3ff1888dc..c315b8f38 100755 --- a/engine/dummy_game.asm +++ b/engine/dummy_game.asm @@ -10,7 +10,7 @@ _DummyGame: ; e1e5b (38:5e5b) call DisableLCD ld b, SCGB_DIPLOMA call GetSGBLayout - callab ClearSpriteAnims + callfar ClearSpriteAnims ld hl, LZ_e2221 ld de, VTiles2 tile $00 call Decompress @@ -47,7 +47,7 @@ _DummyGame: ; e1e5b (38:5e5b) bit 7, a jr nz, .quit call .ExecuteJumptable - callab PlaySpriteAnimations + callfar PlaySpriteAnimations call DelayFrame and a ret diff --git a/engine/events.asm b/engine/events.asm index b78010d1d..d8e4883ae 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -120,14 +120,14 @@ StartMap: ; 96724 ld hl, MapStatus ld bc, wMapStatusEnd - MapStatus call ByteFill - callba InitCallReceiveDelay + farcall InitCallReceiveDelay call ClearJoypad EnterMap: ; 9673e xor a ld [wXYComparePointer], a ld [wXYComparePointer + 1], a call SetUpFiveStepWildEncounterCooldown - callba RunMapSetupScript + farcall RunMapSetupScript call DisableEvents ld a, [hMapEntryMethod] @@ -159,7 +159,7 @@ UnusedWait30Frames: ; 9676d HandleMap: ; 96773 call ResetOverworldDelay call HandleMapTimeAndJoypad - callba HandleCmdQueue ; no need to farcall + farcall HandleCmdQueue ; no need to farcall call MapEvents ; Not immediately entering a connected map will cause problems. @@ -188,7 +188,7 @@ MapEvents: ; 96795 .events ; 967a1 call PlayerEvents call DisableEvents - callba ScriptEvents + farcall ScriptEvents ret ; 967ae @@ -227,16 +227,16 @@ HandleMapTimeAndJoypad: ; 967c1 ; 967d1 HandleMapObjects: ; 967d1 - callba HandleNPCStep ; engine/map_objects.asm - callba _HandlePlayerStep + farcall HandleNPCStep ; engine/map_objects.asm + farcall _HandlePlayerStep call _CheckObjectEnteringVisibleRange ret ; 967e1 HandleMapBackground: ; 967e1 - callba _UpdateSprites - callba ScrollScreen - callba PlaceMapNameSign + farcall _UpdateSprites + farcall ScrollScreen + farcall PlaceMapNameSign ret ; 967f4 @@ -264,7 +264,7 @@ _CheckObjectEnteringVisibleRange: ; 96812 ld hl, wPlayerStepFlags bit 6, [hl] ret z - callba CheckObjectEnteringVisibleRange + farcall CheckObjectEnteringVisibleRange ret ; 9681f @@ -300,7 +300,7 @@ PlayerEvents: ; 9681f .ok push af - callba EnableScriptMode + farcall EnableScriptMode pop af ld [ScriptRunning], a @@ -340,7 +340,7 @@ CheckTileEvent: ; 96874 call CheckWarpConnxnScriptFlag jr z, .connections_disabled - callba CheckMovingOffEdgeOfMap + farcall CheckMovingOffEdgeOfMap jr c, .map_connection call CheckWarpTile @@ -465,8 +465,8 @@ endr ld hl, ScriptFlags res 3, [hl] - callba EnableScriptMode - callba ScriptEvents + farcall EnableScriptMode + farcall ScriptEvents ld hl, ScriptFlags bit 3, [hl] @@ -495,15 +495,15 @@ CheckTimeEvents: ; 9693a bit 2, [hl] ; bug contest jr z, .do_daily - callba CheckBugContestTimer + farcall CheckBugContestTimer jr c, .end_bug_contest xor a ret .do_daily - callba CheckDailyResetTimer - callba CheckPokerusTick - callba CheckPhoneCall + farcall CheckDailyResetTimer + farcall CheckPokerusTick + farcall CheckPhoneCall ret c .nothing @@ -532,7 +532,7 @@ OWPlayerInput: ; 96974 jr nz, .NoAction ; Can't perform button actions while sliding on ice. - callba CheckStandingOnIce + farcall CheckStandingOnIce jr c, .NoAction call CheckAPressOW @@ -547,7 +547,7 @@ OWPlayerInput: ; 96974 .Action: push af - callba StopPlayerForEvent + farcall StopPlayerForEvent pop af scf ret @@ -576,7 +576,7 @@ PlayTalkObject: ; 969ac ; 969b5 TryObjectEvent: ; 969b5 - callba CheckFacingObject + farcall CheckFacingObject jr c, .IsObject xor a ret @@ -804,7 +804,7 @@ CheckSignFlag: ; 96ad8 ; 96af0 PlayerMovement: ; 96af0 - callba DoPlayerMovement + farcall DoPlayerMovement ld a, c ld hl, .pointers rst JumpTable @@ -934,7 +934,7 @@ CountStep: ; 96b79 jr nz, .done ; If there is a special phone call, don't count the step. - callba CheckSpecialPhoneCall + farcall CheckSpecialPhoneCall jr c, .doscript ; If Repel wore off, don't count the step. @@ -949,7 +949,7 @@ CountStep: ; 96b79 ; Every 256 steps, increase the happiness of all your Pokemon. jr nz, .skip_happiness - callba StepHappiness + farcall StepHappiness .skip_happiness ; Every 256 steps, offset from the happiness incrementor by 128 steps, @@ -959,12 +959,12 @@ CountStep: ; 96b79 cp $80 jr nz, .skip_egg - callba DoEggStep + farcall DoEggStep jr nz, .hatch .skip_egg ; Increase the EXP of (both) DayCare Pokemon by 1. - callba DayCareStep + farcall DayCareStep ; Every four steps, deal damage to all Poisoned Pokemon ld hl, PoisonStepCount @@ -973,11 +973,11 @@ CountStep: ; 96b79 jr c, .skip_poison ld [hl], 0 - callba DoPoisonStep + farcall DoPoisonStep jr c, .doscript .skip_poison - callba DoBikeStep + farcall DoBikeStep .done xor a diff --git a/engine/events_2.asm b/engine/events_2.asm index e141b6638..6a2a79013 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -54,38 +54,38 @@ CheckFacingTileEvent:: ; 97c5f call GetFacingTileCoord ld [EngineBuffer1], a ld c, a - callba CheckFacingTileForStd + farcall CheckFacingTileForStd jr c, .done call CheckCutTreeTile jr nz, .whirlpool - callba TryCutOW + farcall TryCutOW jr .done .whirlpool ld a, [EngineBuffer1] call CheckWhirlpoolTile jr nz, .waterfall - callba TryWhirlpoolOW + farcall TryWhirlpoolOW jr .done .waterfall ld a, [EngineBuffer1] call CheckWaterfallTile jr nz, .headbutt - callba TryWaterfallOW + farcall TryWaterfallOW jr .done .headbutt ld a, [EngineBuffer1] call CheckHeadbuttTreeTile jr nz, .surf - callba TryHeadbuttOW + farcall TryHeadbuttOW jr c, .done jr .noevent .surf - callba TrySurfOW + farcall TrySurfOW jr nc, .noevent jr .done @@ -111,7 +111,7 @@ RandomEncounter:: ; 97cc0 ld hl, StatusFlags2 bit 2, [hl] ; bug contest jr nz, .bug_contest - callba TryWildEncounter + farcall TryWildEncounter jr nz, .nope jr .ok @@ -157,7 +157,7 @@ CanUseSweetScent:: ; 97cfd jr z, .ice_check cp DUNGEON jr z, .ice_check - callba CheckGrassCollision + farcall CheckGrassCollision jr nc, .no .ice_check @@ -176,7 +176,7 @@ _TryWildEncounter_BugContest: ; 97d23 call TryWildEncounter_BugContest ret nc call ChooseWildEncounter_BugContest - callba CheckRepelEffect + farcall CheckRepelEffect ret ; 97d31 @@ -242,8 +242,8 @@ TryWildEncounter_BugContest: ; 97d64 ld b, 20 percent .ok - callba ApplyMusicEffectOnEncounterRate - callba ApplyCleanseTagEffectOnEncounterRate + farcall ApplyMusicEffectOnEncounterRate + farcall ApplyCleanseTagEffectOnEncounterRate call Random ld a, [hRandomAdd] cp b diff --git a/engine/events_3.asm b/engine/events_3.asm index f53297d61..1b4a4f233 100755 --- a/engine/events_3.asm +++ b/engine/events_3.asm @@ -1,14 +1,14 @@ ReturnFromMapSetupScript:: ; b8000 xor a ld [hBGMapMode], a - ; For some reson, GameFreak chose to use a callba here instead of just falling through. + ; For some reson, GameFreak chose to use a farcall here instead of just falling through. ; No other function in the game references the function at 2E:400A, here labeled - ; ReturnFromMapSetupScript.inefficientcallba. - callba .inefficientcallba ; this is a waste of 6 ROM bytes and 6 stack bytes + ; ReturnFromMapSetupScript.inefficient_farcall. + farcall .inefficient_farcall ; this is a waste of 6 ROM bytes and 6 stack bytes ret ; b800a -.inefficientcallba ; b800a +.inefficient_farcall ; b800a ld a, [MapGroup] ld b, a ld a, [MapNumber] @@ -45,7 +45,7 @@ ReturnFromMapSetupScript:: ; b8000 ld [wLandmarkSignTimer], a call LoadMapNameSignGFX call InitMapNameFrame - callba HDMATransfer_OnlyTopFourRows + farcall HDMATransfer_OnlyTopFourRows ret .dont_do_map_sign @@ -113,7 +113,7 @@ PlaceMapNameSign:: ; b8098 (2e:4098) jr nz, .skip2 call InitMapNameFrame call PlaceMapNameCenterAlign - callba HDMATransfer_OnlyTopFourRows + farcall HDMATransfer_OnlyTopFourRows .skip2 ld a, $80 ld a, $70 @@ -151,7 +151,7 @@ InitMapNameFrame: ; b80d3 PlaceMapNameCenterAlign: ; b80e1 (2e:40e1) ld a, [wCurrentLandmark] ld e, a - callba GetLandmarkName + farcall GetLandmarkName call .GetNameLength ld a, SCREEN_WIDTH sub c @@ -360,7 +360,7 @@ CheckForHiddenItems: ; b8172 TreeMonEncounter: ; b81ea - callba TrainerRankings_TreeEncounters + farcall TrainerRankings_TreeEncounters xor a ld [TempWildMonSpecies], a diff --git a/engine/evolution_animation.asm b/engine/evolution_animation.asm index 173a31bf2..e2713fceb 100755 --- a/engine/evolution_animation.asm +++ b/engine/evolution_animation.asm @@ -36,7 +36,7 @@ EvolutionAnimation: ; 4e5e1 ld de, MUSIC_NONE call PlayMusic - callba ClearSpriteAnims + farcall ClearSpriteAnims ld de, .GFX ld hl, VTiles0 @@ -106,7 +106,7 @@ EvolutionAnimation: ; 4e5e1 ld c, $0 call .GetSGBLayout call .PlayEvolvedSFX - callba ClearSpriteAnims + farcall ClearSpriteAnims call .check_statused jr c, .no_anim @@ -143,7 +143,7 @@ EvolutionAnimation: ; 4e5e1 ld c, $0 call .GetSGBLayout call .PlayEvolvedSFX - callba ClearSpriteAnims + farcall ClearSpriteAnims call .check_statused ret c @@ -263,7 +263,7 @@ EvolutionAnimation: ; 4e5e1 call GetPartyLocation ld b, h ld c, l - callba CheckFaintedFrzSlp + farcall CheckFaintedFrzSlp ret ; 4e7a6 @@ -337,7 +337,7 @@ EvolutionAnimation: ; 4e5e1 .AnimateBallsOfLight: ; 4e80c push bc - callab PlaySpriteAnimations + callfar PlaySpriteAnimations ; a = (([hVBlankCounter] + 4) / 2) % NUM_PALETTES ld a, [hVBlankCounter] and %1110 diff --git a/engine/evolve.asm b/engine/evolve.asm index ada1e2f5f..c335229d6 100755 --- a/engine/evolve.asm +++ b/engine/evolve.asm @@ -225,7 +225,7 @@ EvolveAfterBattle_MasterLoop ld [hBGMapMode], a call ClearSprites - callba EvolutionAnimation + farcall EvolutionAnimation push af call ClearSprites @@ -247,7 +247,7 @@ EvolveAfterBattle_MasterLoop push hl ld hl, Text_EvolvedIntoPKMN call PrintTextBoxText - callba TrainerRankings_MonsEvolved + farcall TrainerRankings_MonsEvolved ld de, MUSIC_NONE call PlayMusic @@ -312,7 +312,7 @@ EvolveAfterBattle_MasterLoop ld hl, TempMonDVs predef GetUnownLetter - callab UpdateUnownDex + callfar UpdateUnownDex .skip_unown pop de diff --git a/engine/fruit_trees.asm b/engine/fruit_trees.asm index 4f9de8300..595e41824 100644 --- a/engine/fruit_trees.asm +++ b/engine/fruit_trees.asm @@ -58,7 +58,7 @@ CheckFruitTree: ; 44055 ; 4405f PickedFruitTree: ; 4405f - callba TrainerRankings_FruitPicked + farcall TrainerRankings_FruitPicked ld b, 1 jp GetFruitTreeFlag ; 4406a diff --git a/engine/get_breedmon_growth.asm b/engine/get_breedmon_growth.asm index 20c546315..b029043d6 100644 --- a/engine/get_breedmon_growth.asm +++ b/engine/get_breedmon_growth.asm @@ -3,7 +3,7 @@ GetBreedMon1LevelGrowth: ; e698 ld de, TempMon ld bc, BOXMON_STRUCT_LENGTH call CopyBytes - callab CalcLevel + callfar CalcLevel ld a, [wBreedMon1Level] ld b, a ld a, d @@ -17,7 +17,7 @@ GetBreedMon2LevelGrowth: ; e6b3 ld de, TempMon ld bc, BOXMON_STRUCT_LENGTH call CopyBytes - callab CalcLevel + callfar CalcLevel ld a, [wBreedMon2Level] ld b, a ld a, d diff --git a/engine/health.asm b/engine/health.asm index 1c926f677..0f7ba156d 100755 --- a/engine/health.asm +++ b/engine/health.asm @@ -49,7 +49,7 @@ HealPartyMon: ; c677 ld a, [hl] ld [bc], a - callba RestoreAllPP + farcall RestoreAllPP ret ComputeHPBarPixels: ; c699 diff --git a/engine/init_gender.asm b/engine/init_gender.asm index dfb3fbdd4..092a1c9ea 100755 --- a/engine/init_gender.asm +++ b/engine/init_gender.asm @@ -92,7 +92,7 @@ LoadGenderScreenPal: ; 48e47 (12:4e47) ld bc, 1 palettes ld a, $5 call FarCopyWRAM - callba ApplyPals + farcall ApplyPals ret ; 48e5c (12:4e5c) diff --git a/engine/init_map.asm b/engine/init_map.asm index 5dd6c7b8a..d73a5acf5 100644 --- a/engine/init_map.asm +++ b/engine/init_map.asm @@ -30,14 +30,14 @@ ReanchorBGMap_NoOAMUpdate:: ; 6454 ld a, VBGMap1 / $100 call .LoadBGMapAddrIntoHRAM call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap - callba LoadOW_BGPal7 - callba ApplyPals + farcall LoadOW_BGPal7 + farcall ApplyPals ld a, $1 ld [hCGBPalUpdate], a xor a ld [hBGMapMode], a ld [hWY], a - callba HDMATransfer_FillBGMap0WithBlack ; no need to farcall + farcall HDMATransfer_FillBGMap0WithBlack ; no need to farcall ld a, VBGMap0 / $100 call .LoadBGMapAddrIntoHRAM xor a diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 5127a9895..c73535459 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -6,7 +6,7 @@ _MainMenu: ; 5ae8 ld a, e ld [wMapMusic], a call PlayMusic - callba MainMenu + farcall MainMenu jp StartTitleScreen ; 5b04 @@ -56,13 +56,13 @@ NewGame_ClearTileMapEtc: ; 5b44 MysteryGift: ; 5b54 call UpdateTime - callba DoMysteryGiftIfDayHasPassed - callba DoMysteryGift + farcall DoMysteryGiftIfDayHasPassed + farcall DoMysteryGift ret ; 5b64 OptionsMenu: ; 5b64 - callba _OptionsMenu + farcall _OptionsMenu ret ; 5b6b @@ -86,14 +86,14 @@ NewGame: ; 5b6b ; 5b8f AreYouABoyOrAreYouAGirl: ; 5b8f - callba Mobile_AlwaysReturnNotCarry ; some mobile stuff + farcall Mobile_AlwaysReturnNotCarry ; some mobile stuff jr c, .ok - callba InitGender + farcall InitGender ret .ok ld c, 0 - callba InitMobileProfile ; mobile + farcall InitMobileProfile ; mobile ret ; 5ba7 @@ -220,11 +220,11 @@ ENDC call InitializeNPCNames - callba InitDecorations + farcall InitDecorations - callba DeletePartyMonMail + farcall DeletePartyMonMail - callba DeleteMobileEventIndex + farcall DeleteMobileEventIndex call ResetGameTime ret @@ -316,8 +316,8 @@ InitializeNPCNames: ; 5ce9 InitializeWorld: ; 5d23 call ShrinkPlayer - callba SpawnPlayer - callba _InitializeStartDay + farcall SpawnPlayer + farcall _InitializeStartDay ret ; 5d33 @@ -349,9 +349,9 @@ LoadOrRegenerateLuckyIDNumber: ; 5d33 ; 5d65 Continue: ; 5d65 - callba TryLoadSaveFile + farcall TryLoadSaveFile jr c, .FailToLoad - callba _LoadData + farcall _LoadData call LoadStandardMenuDataHeader call DisplaySaveInfoOnContinue ld a, $1 @@ -382,9 +382,9 @@ Continue: ; 5d65 call ClearTileMap ld c, 20 call DelayFrames - callba JumpRoamMons - callba MysteryGift_CopyReceivedDecosToPC ; Mystery Gift - callba Function140ae ; time-related + farcall JumpRoamMons + farcall MysteryGift_CopyReceivedDecosToPC ; Mystery Gift + farcall Function140ae ; time-related ld a, [wSpawnAfterChampion] cp SPAWN_LANCE jr z, .SpawnAfterE4 @@ -416,7 +416,7 @@ PostCreditsSpawn: ; 5de7 ; 5df0 Continue_MobileAdapterMenu: ; 5df0 - callba Mobile_AlwaysReturnNotCarry ; mobile check + farcall Mobile_AlwaysReturnNotCarry ; mobile check ret nc ; the rest of this stuff is never reached because @@ -433,8 +433,8 @@ Continue_MobileAdapterMenu: ; 5df0 ld c, 20 call DelayFrames ld c, $1 - callba InitMobileProfile ; mobile - callba _SaveData + farcall InitMobileProfile ; mobile + farcall _SaveData ld a, 8 ld [MusicFade], a ld a, MUSIC_NONE % $100 @@ -466,7 +466,7 @@ Continue_CheckRTC_RestartClock: ; 5e48 call CheckRTCStatus and %10000000 ; Day count exceeded 16383 jr z, .pass - callba RestartClock + farcall RestartClock ld a, c and a jr z, .pass @@ -488,7 +488,7 @@ FinishContinueFunction: ; 5e5d res 7, [hl] ld hl, wEnteredMapFromContinue set 1, [hl] - callba OverworldLoop + farcall OverworldLoop ld a, [wSpawnAfterChampion] cp SPAWN_RED jr z, .AfterRed @@ -671,7 +671,7 @@ Continue_DisplayGameTime: ; 5f84 OakSpeech: ; 0x5f99 - callba InitClock + farcall InitClock call RotateFourPalettesLeft call ClearTileMap @@ -735,7 +735,7 @@ OakSpeech: ; 0x5f99 xor a ld [CurPartySpecies], a - callba DrawIntroPlayerPic + farcall DrawIntroPlayerPic ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS call GetSGBLayout @@ -782,20 +782,20 @@ OakText7: ; 0x606f db "@" NamePlayer: ; 0x6074 - callba MovePlayerPicRight - callba ShowPlayerNamingChoices + farcall MovePlayerPicRight + farcall ShowPlayerNamingChoices ld a, [wMenuCursorY] dec a jr z, .NewName call StorePlayerName - callba ApplyMonOrTrainerPals - callba MovePlayerPicLeft + farcall ApplyMonOrTrainerPals + farcall MovePlayerPicLeft ret .NewName: ld b, 1 ld de, PlayerName - callba NamingScreen + farcall NamingScreen call RotateThreePalettesRight call ClearTileMap @@ -805,7 +805,7 @@ NamePlayer: ; 0x6074 xor a ld [CurPartySpecies], a - callba DrawIntroPlayerPic + farcall DrawIntroPlayerPic ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS call GetSGBLayout @@ -943,7 +943,7 @@ Intro_WipeInFrontpic: ; 6182 Intro_PrepTrainerPic: ; 619c ld de, VTiles2 - callba GetTrainerPic + farcall GetTrainerPic xor a ld [hGraphicStartTile], a hlcoord 6, 4 @@ -966,7 +966,7 @@ ShrinkFrame: ; 61b4 Intro_PlacePlayerSprite: ; 61cd - callba GetPlayerIcon + farcall GetPlayerIcon ld c, $c ld hl, VTiles0 call Request2bpp @@ -1012,9 +1012,9 @@ Intro_PlacePlayerSprite: ; 61cd CrystalIntroSequence: ; 620b - callab Copyright_GFPresents + callfar Copyright_GFPresents jr c, StartTitleScreen - callba CrystalIntro + farcall CrystalIntro StartTitleScreen: ; 6219 ld a, [rSVBK] @@ -1075,7 +1075,7 @@ StartTitleScreen: ; 6219 .TitleScreen: ; 6274 - callba _TitleScreen + farcall _TitleScreen ret ; 627b @@ -1084,7 +1084,7 @@ RunTitleScreen: ; 627b bit 7, a jr nz, .done_title call TitleScreenScene - callba SuicuneFrameIterator + farcall SuicuneFrameIterator call DelayFrame and a ret @@ -1162,7 +1162,7 @@ TitleScreenEntrance: ; 62bc dec b jr nz, .loop - callba AnimateTitleCrystal + farcall AnimateTitleCrystal ret .done @@ -1320,12 +1320,12 @@ TitleScreenEnd: ; 6375 ; 6389 DeleteSaveData: ; 6389 - callba _DeleteSaveData + farcall _DeleteSaveData jp Init ; 6392 ResetClock: ; 6392 - callba _ResetClock + farcall _ResetClock jp Init ; 639b @@ -1401,7 +1401,7 @@ CopyrightString: ; 63fd ; 642e GameInit:: ; 642e - callba TryLoadSaveData + farcall TryLoadSaveData call ClearWindowData call ClearBGPalettes call ClearTileMap diff --git a/engine/item_effects.asm b/engine/item_effects.asm index e881f6338..2d7aa4c69 100644 --- a/engine/item_effects.asm +++ b/engine/item_effects.asm @@ -358,7 +358,7 @@ ParkBall: ; e8a2 ld d, a push de - ; BUG: callba overwrites a, + ; BUG: farcall overwrites a, ; and GetItemHeldEffect takes b anyway. ; This is probably the reason @@ -369,7 +369,7 @@ ParkBall: ; e8a2 ld a, [BattleMonItem] ; ld b, a - callba GetItemHeldEffect + farcall GetItemHeldEffect ld a, b cp HELD_CATCH_CHANCE @@ -478,7 +478,7 @@ ParkBall: ; e8a2 ld [CurPartySpecies], a ld a, [EnemyMonLevel] ld [CurPartyLevel], a - callba LoadEnemyMon + farcall LoadEnemyMon pop af ld [EnemySubStatus5], a @@ -517,7 +517,7 @@ ParkBall: ; e8a2 cp BATTLETYPE_TUTORIAL jp z, .FinishTutorial - callba TrainerRankings_WildMonsCaught + farcall TrainerRankings_WildMonsCaught ld hl, Text_GotchaMonWasCaught call PrintText @@ -569,7 +569,7 @@ ParkBall: ; e8a2 predef TryAddMonToParty - callba SetCaughtData + farcall SetCaughtData ld a, [CurItem] cp FRIEND_BALL @@ -608,7 +608,7 @@ ParkBall: ; e8a2 xor a ; PARTYMON ld [MonType], a ld b, 0 - callba NamingScreen + farcall NamingScreen call RotateThreePalettesRight @@ -625,7 +625,7 @@ ParkBall: ; e8a2 predef SentPkmnIntoBox - callba SetBoxMonCaughtData + farcall SetBoxMonCaughtData ld a, BANK(sBoxCount) call GetSRAMBank @@ -661,7 +661,7 @@ ParkBall: ; e8a2 ld [MonType], a ld de, wMonOrItemNameBuffer ld b, $0 - callba NamingScreen + farcall NamingScreen ld a, BANK(sBoxMonNicknames) call GetSRAMBank @@ -696,7 +696,7 @@ ParkBall: ; e8a2 jr .return_from_capture .catch_bug_contest_mon - callba BugContest_SetCaughtContestMon + farcall BugContest_SetCaughtContestMon jr .return_from_capture .FinishTutorial: @@ -985,7 +985,7 @@ LoveBallMultiplier: ld [MonType], a ld a, [CurBattleMon] ld [CurPartyMon], a - callba GetGender + farcall GetGender jr c, .done1 ; no effect on genderless ld d, 0 ; male @@ -999,7 +999,7 @@ LoveBallMultiplier: ld [CurPartySpecies], a ld a, WILDMON ld [MonType], a - callba GetGender + farcall GetGender jr c, .done2 ; no effect on genderless ld d, 0 ; male @@ -1173,17 +1173,17 @@ Text_AskNicknameNewlyCaughtMon: ; 0xedf5 ; 0xedfa ReturnToBattle_UseBall: ; edfa (3:6dfa) - callba _ReturnToBattle_UseBall + farcall _ReturnToBattle_UseBall ret TownMap: ; ee01 - callba PokegearMap + farcall PokegearMap ret ; ee08 Bicycle: ; ee08 - callba BikeFunction + farcall BikeFunction ret ; ee0f @@ -1208,7 +1208,7 @@ SunStone: ; ee0f ld a, $1 ld [wForceEvolution], a - callba EvolvePokemon + farcall EvolvePokemon ld a, [wMonTriedToEvolve] and a @@ -1269,7 +1269,7 @@ Calcium: ; ee3d call PrintText ld c, HAPPINESS_USEDITEM - callba ChangeHappiness + farcall ChangeHappiness jp UseDisposableItem @@ -1383,7 +1383,7 @@ RareCandy: ; ef14 ld [CurPartyLevel], a push de ld d, a - callba CalcExpAtLevel + farcall CalcExpAtLevel pop de ld a, MON_EXP @@ -1421,7 +1421,7 @@ RareCandy: ; ef14 ld a, [hl] adc b ld [hl], a - callba LevelUpHappinessMod + farcall LevelUpHappinessMod ld a, PARTYMENUTEXT_LEVEL_UP call ItemActionText @@ -1449,7 +1449,7 @@ RareCandy: ; ef14 xor a ld [wForceEvolution], a - callba EvolvePokemon + farcall EvolvePokemon jp UseDisposableItem ; efad @@ -1466,7 +1466,7 @@ HealPowder: ; efad cp $0 jr nz, .asm_efc9 ld c, HAPPINESS_BITTERPOWDER - callba ChangeHappiness + farcall ChangeHappiness call LooksBitterMessage @@ -1569,7 +1569,7 @@ HealStatus: ; f030 (3:7030) res SUBSTATUS_CONFUSED, [hl] .not_full_heal push bc - callba CalcPlayerStats + farcall CalcPlayerStats pop bc ret @@ -1635,7 +1635,7 @@ RevivalHerb: ; f0a9 jr nz, .asm_f0c5 ld c, HAPPINESS_REVIVALHERB - callba ChangeHappiness + farcall ChangeHappiness call LooksBitterMessage ld a, 0 @@ -1797,7 +1797,7 @@ EnergypowderEnergyRootCommon: ; f192 cp 0 jr nz, .skip_happiness - callba ChangeHappiness + farcall ChangeHappiness call LooksBitterMessage ld a, 0 @@ -1876,15 +1876,15 @@ UseItem_SelectMon: ; f1f9 (3:71f9) ret ChoosePkmnToUseItemOn: ; f21c (3:721c) - callba LoadPartyMenuGFX - callba InitPartyMenuWithCancel - callba InitPartyMenuGFX - callba WritePartyMenuTilemap - callba PrintPartyMenuText + farcall LoadPartyMenuGFX + farcall InitPartyMenuWithCancel + farcall InitPartyMenuGFX + farcall WritePartyMenuTilemap + farcall PrintPartyMenuText call WaitBGMap call SetPalettes call DelayFrame - callba PartyMenuSelect + farcall PartyMenuSelect ret ItemActionText: ; f24a (3:724a) @@ -1896,8 +1896,8 @@ ItemActionText: ; f24a (3:724a) push hl push de push bc - callba WritePartyMenuTilemap - callba PrintPartyMenuActionText + farcall WritePartyMenuTilemap + farcall PrintPartyMenuActionText call WaitBGMap call SetPalettes call DelayFrame @@ -2234,7 +2234,7 @@ Softboiled_MilkDrinkFunction: ; f3df (3:73df) EscapeRope: ; f44f xor a ld [wItemEffectSucceeded], a - callba EscapeRopeFunction + farcall EscapeRopeFunction ld a, [wItemEffectSucceeded] cp 1 @@ -2344,16 +2344,16 @@ XSpecial: ; f4c5 ld [hBattleTurn], a ld [AttackMissed], a ld [EffectFailed], a - callba CheckIfStatCanBeRaised + farcall CheckIfStatCanBeRaised call WaitSFX - callba BattleCommand_StatUpMessage - callba BattleCommand_StatUpFailText + farcall BattleCommand_StatUpMessage + farcall BattleCommand_StatUpFailText ld a, [CurBattleMon] ld [CurPartyMon], a ld c, HAPPINESS_USEDXITEM - callba ChangeHappiness + farcall ChangeHappiness ret ; f504 @@ -2499,13 +2499,13 @@ SuperRod: ; f5ad ; f5b1 UseRod: ; f5b1 - callba FishFunction + farcall FishFunction ret ; f5b8 Itemfinder: ; f5b8 - callba ItemFinder + farcall ItemFinder ret ; f5bf @@ -2547,7 +2547,7 @@ Mysteryberry: ; f5bf ld [CurMoveNum], a ld a, $2 ld [wMoveSelectionMenuType], a - callba MoveSelectionScreen + farcall MoveSelectionScreen pop bc ld a, b @@ -2782,25 +2782,25 @@ UnknownText_0xf739: ; 0xf739 Squirtbottle: ; f73e - callba _Squirtbottle + farcall _Squirtbottle ret ; f745 CardKey: ; f745 - callba _CardKey + farcall _CardKey ret ; f74c BasementKey: ; f74c - callba _BasementKey + farcall _BasementKey ret ; f753 SacredAsh: ; f753 - callba _SacredAsh + farcall _SacredAsh ld a, [wItemEffectSucceeded] cp $1 ret nz @@ -2817,7 +2817,7 @@ NormalBox: ; f763 GorgeousBox: ; f767 ld c, DECOFLAG_GOLD_TROPHY_DOLL OpenBox: ; f769 - callba SetSpecificDecorationFlag + farcall SetSpecificDecorationFlag ld hl, .text call PrintText diff --git a/engine/link.asm b/engine/link.asm index 619d5bae3..390855338 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -14,14 +14,14 @@ LinkCommunications: ; 28000 call UpdateSprites call LoadStandardFont call LoadFontsBattleExtra - callba LinkComms_LoadPleaseWaitTextboxBorderGFX + farcall LinkComms_LoadPleaseWaitTextboxBorderGFX call WaitBGMap2 hlcoord 3, 8 ld b, 2 ld c, 12 ld d, h ld e, l - callba LinkTextbox2 + farcall LinkTextbox2 hlcoord 4, 10 ld de, String_PleaseWait call PlaceString @@ -150,7 +150,7 @@ TimeCapsule: ; 2805d ld [wd265], a push hl push de - callab ConvertMon_1to2 + callfar ConvertMon_1to2 pop de pop hl ld a, [wd265] @@ -362,19 +362,19 @@ Gen2ToGen2LinkComms: ; 28177 .fix_mail_loop push bc push de - callba IsMailEuropean + farcall IsMailEuropean ld a, c or a jr z, .next sub $3 jr nc, .skip - callba DeutenEnglischenPost + farcall DeutenEnglischenPost jr .next .skip cp $2 jr nc, .next - callba HandleSpanishItalianMail + farcall HandleSpanishItalianMail .next pop de @@ -419,7 +419,7 @@ Gen2ToGen2LinkComms: ; 28177 ld a, CAL ld [OtherTrainerClass], a call ClearScreen - callba Link_WaitBGMap + farcall Link_WaitBGMap ld hl, Options ld a, [hl] push af @@ -463,7 +463,7 @@ Gen2ToGen2LinkComms: ; 28177 ld [wDisableTextAcceleration], a pop af ld [Options], a - callba LoadPokemonData + farcall LoadPokemonData jp Function28b22 .ready_to_trade @@ -491,7 +491,7 @@ LinkTimeout: ; 283b2 push de ld d, h ld e, l - callba LinkTextbox2 + farcall LinkTextbox2 pop de pop hl bccoord 1, 14 @@ -658,7 +658,7 @@ Link_PrepPartyData_Gen1: ; 28499 ld [wd265], a push hl push de - callab ConvertMon_2to1 + callfar ConvertMon_2to1 pop de pop hl ld a, [wd265] @@ -698,7 +698,7 @@ Link_PrepPartyData_Gen1: ; 28499 push bc ld a, [hl] ld [wd265], a - callab ConvertMon_2to1 + callfar ConvertMon_2to1 pop bc pop de ld a, [wd265] @@ -882,20 +882,20 @@ Link_PrepPartyData_Gen2: ; 28595 push hl push de push hl - callba IsMailEuropean + farcall IsMailEuropean pop de ld a, c or a jr z, .next sub $3 jr nc, .italian_spanish - callba HandleFrenchGermanMail + farcall HandleFrenchGermanMail jr .next .italian_spanish cp $2 jr nc, .next - callba HandleSpanishItalianMail + farcall HandleSpanishItalianMail .next pop de @@ -993,7 +993,7 @@ Function2868a: ; 2868a push bc push de ld [wd265], a - callab ConvertMon_1to2 + callfar ConvertMon_1to2 pop de pop bc ld a, [wd265] @@ -1195,7 +1195,7 @@ Link_FindFirstNonControlCharacter_AllowZero: ; 287d8 InitTradeMenuDisplay: ; 287e3 call ClearScreen call LoadTradeScreenBorder - callba InitTradeSpeciesList + farcall InitTradeSpeciesList xor a ld hl, wOtherPlayerLinkMode ld [hli], a @@ -1232,7 +1232,7 @@ LinkTrade_OTPartyMenu: ; 28803 ld [w2DMenuFlags2], a LinkTradeOTPartymonMenuLoop: ; 28835 - callba LinkTradeMenu + farcall LinkTradeMenu ld a, d and a jp z, LinkTradePartiesMenuMasterLoop @@ -1240,9 +1240,9 @@ LinkTradeOTPartymonMenuLoop: ; 28835 jr z, .not_a_button ld a, $1 ld [wInitListType], a - callab InitList + callfar InitList ld hl, OTPartyMon1Species - callba LinkMonStatsScreen + farcall LinkMonStatsScreen jp LinkTradePartiesMenuMasterLoop .not_a_button @@ -1274,7 +1274,7 @@ LinkTradeOTPartymonMenuLoop: ; 28835 ; 2888b LinkTrade_PlayerPartyMenu: ; 2888b - callba InitMG_Mobile_LinkTradePalMap + farcall InitMG_Mobile_LinkTradePalMap xor a ld [MonType], a ld a, A_BUTTON | D_UP | D_DOWN @@ -1298,7 +1298,7 @@ LinkTrade_PlayerPartyMenu: ; 2888b call WaitBGMap2 LinkTradePartymonMenuLoop: ; 288c5 - callba LinkTradeMenu + farcall LinkTradeMenu ld a, d and a jr nz, .check_joypad @@ -1366,7 +1366,7 @@ Function28926: ; 28926 hlcoord 2, 16 ld de, .String_Stats_Trade call PlaceString - callba Link_WaitBGMap + farcall Link_WaitBGMap .joy_loop ld a, " " @@ -1433,8 +1433,8 @@ Function28926: ; 28926 ld [wMenuCursorY], a ld a, $4 ld [wInitListType], a - callab InitList - callba LinkMonStatsScreen + callfar InitList + farcall LinkMonStatsScreen call Call_LoadTempTileMapToTileMap hlcoord 6, 1 lb bc, 6, 1 @@ -1453,7 +1453,7 @@ Function28926: ; 28926 dec a ld [wd002], a ld [wPlayerLinkAction], a - callba Function16d6ce + farcall Function16d6ce ld a, [wOtherPlayerLinkMode] cp $f jp z, InitTradeMenuDisplay @@ -1461,9 +1461,9 @@ Function28926: ; 28926 call Function28b68 ld c, 100 call DelayFrames - callba ValidateOTTrademon + farcall ValidateOTTrademon jr c, .abnormal - callba Functionfb5dd + farcall Functionfb5dd jp nc, LinkTrade xor a ld [wcf57], a @@ -1472,7 +1472,7 @@ Function28926: ; 28926 ld b, 4 ld c, 18 call Predef_LinkTextbox - callba Link_WaitBGMap + farcall Link_WaitBGMap ld hl, .Text_CantTradeLastMon bccoord 1, 14 call PlaceHLTextAtBC @@ -1494,7 +1494,7 @@ Function28926: ; 28926 ld b, 4 ld c, 18 call Predef_LinkTextbox - callba Link_WaitBGMap + farcall Link_WaitBGMap ld hl, .Text_Abnormal bccoord 1, 14 call PlaceHLTextAtBC @@ -1509,7 +1509,7 @@ Function28926: ; 28926 call PlaceString ld a, $1 ld [wPlayerLinkAction], a - callba Function16d6ce + farcall Function16d6ce ld c, 100 call DelayFrames jp InitTradeMenuDisplay @@ -1575,7 +1575,7 @@ Function28ade: ; 28ade ldcoord_a 9, 17 ld a, $f ld [wPlayerLinkAction], a - callba Function16d6ce + farcall Function16d6ce ld a, [wOtherPlayerLinkMode] cp $f jr nz, .loop1 @@ -1650,7 +1650,7 @@ LinkTrade: ; 28b87 ld b, $4 ld c, $12 call Predef_LinkTextbox - callba Link_WaitBGMap + farcall Link_WaitBGMap ld a, [wd002] ld hl, PartySpecies ld c, a @@ -1700,7 +1700,7 @@ LinkTrade: ; 28b87 ld a, 1 ld [wMenuCursorY], a ld [wMenuCursorX], a - callba Link_WaitBGMap + farcall Link_WaitBGMap call ScrollingMenuJoypad push af call Call_ExitMenu @@ -1722,13 +1722,13 @@ LinkTrade: ; 28b87 hlcoord 1, 14 ld de, String_TooBadTheTradeWasCanceled call PlaceString - callba Function16d6ce + farcall Function16d6ce jp Function28ea3 .asm_28c54 ld a, $2 ld [wPlayerLinkAction], a - callba Function16d6ce + farcall Function16d6ce ld a, [wOtherPlayerLinkMode] dec a jr nz, .asm_28c7b @@ -1817,7 +1817,7 @@ LinkTrade: ; 28b87 call GetPartyLocation ld b, h ld c, l - callba GetCaughtGender + farcall GetCaughtGender ld a, c ld [wPlayerTrademonCaughtData], a ld hl, OTPlayerName @@ -1856,7 +1856,7 @@ LinkTrade: ; 28b87 call GetPartyLocation ld b, h ld c, l - callba GetCaughtGender + farcall GetCaughtGender ld a, c ld [wOTTrademonCaughtData], a ld a, [wd002] @@ -1869,7 +1869,7 @@ LinkTrade: ; 28b87 ld [wd002], a xor a ld [wPokemonWithdrawDepositParameter], a - callab RemoveMonFromPartyOrBox + callfar RemoveMonFromPartyOrBox ld a, [PartyCount] dec a ld [CurPartyMon], a @@ -1918,11 +1918,11 @@ LinkTrade: ; 28b87 ld a, [PartyCount] dec a ld [CurPartyMon], a - callab EvolvePokemon + callfar EvolvePokemon call ClearScreen call LoadTradeScreenBorder call SetTradeRoomBGPals - callba Link_WaitBGMap + farcall Link_WaitBGMap ld b, $1 pop af ld c, a @@ -1957,9 +1957,9 @@ LinkTrade: ; 28b87 jr nz, .loop .save - callba SaveAfterLinkTrade - callba TrainerRankings_Trades - callba BackupMobileEventIndex + farcall SaveAfterLinkTrade + farcall TrainerRankings_Trades + farcall BackupMobileEventIndex ld c, 40 call DelayFrames hlcoord 0, 12 @@ -1969,7 +1969,7 @@ LinkTrade: ; 28b87 hlcoord 1, 14 ld de, String28ebd call PlaceString - callba Link_WaitBGMap + farcall Link_WaitBGMap ld c, 50 call DelayFrames ld a, [wLinkMode] @@ -2005,17 +2005,17 @@ String_TooBadTheTradeWasCanceled: ; 28ece Predef_LinkTextbox: ; 28eef ld d, h ld e, l - callba LinkTextbox + farcall LinkTextbox ret ; 28ef8 LoadTradeScreenBorder: ; 28ef8 - callba _LoadTradeScreenBorder + farcall _LoadTradeScreenBorder ret ; 28eff SetTradeRoomBGPals: ; 28eff - callba LoadTradeRoomBGPals_ ; just a nested farcall; so wasteful + farcall LoadTradeRoomBGPals_ ; just a nested farcall; so wasteful call SetPalettes ret ; 28f09 @@ -2030,7 +2030,7 @@ Function28f09: ; 28f09 ld b, 6 ld c, 18 call Predef_LinkTextbox - callba PlaceTradePartnerNamesAndParty + farcall PlaceTradePartnerNamesAndParty ret ; 28f24 @@ -2064,7 +2064,7 @@ Special_CheckTimeCapsuleCompatibility: ; 29bfb push hl push bc ld d, [hl] - callba ItemIsMail + farcall ItemIsMail pop bc pop hl jr c, .mon_has_mail @@ -2435,7 +2435,7 @@ Link_CheckCommunicationError: ; 29e0c Special_TryQuickSave: ; 29e66 ld a, [wd265] push af - callba Link_SaveGame + farcall Link_SaveGame ld a, $1 jr nc, .return_result xor a @@ -2479,7 +2479,7 @@ Special_TimeCapsule: ; 29eaf ld a, LINK_TIMECAPSULE ld [wLinkMode], a call DisableSpriteUpdates - callab LinkCommunications + callfar LinkCommunications call EnableSpriteUpdates xor a ld [hVBlank], a @@ -2490,7 +2490,7 @@ Special_TradeCenter: ; 29ec4 ld a, LINK_TRADECENTER ld [wLinkMode], a call DisableSpriteUpdates - callab LinkCommunications + callfar LinkCommunications call EnableSpriteUpdates xor a ld [hVBlank], a @@ -2501,7 +2501,7 @@ Special_Colosseum: ; 29ed9 ld a, LINK_COLOSSEUM ld [wLinkMode], a call DisableSpriteUpdates - callab LinkCommunications + callfar LinkCommunications call EnableSpriteUpdates xor a ld [hVBlank], a diff --git a/engine/link_trade.asm b/engine/link_trade.asm index 3983dfd1d..bb2765b50 100755 --- a/engine/link_trade.asm +++ b/engine/link_trade.asm @@ -23,8 +23,8 @@ Function16d43b: ; 16d43b call ClearBGPalettes call ClearTileMap call ClearSprites - callba __LoadTradeScreenBorder ; useless to farcall - callba Function16d42e ; useless to farcall + farcall __LoadTradeScreenBorder ; useless to farcall + farcall Function16d42e ; useless to farcall ld b, SCGB_DIPLOMA call GetSGBLayout call SetPalettes @@ -119,8 +119,8 @@ _LinkTextbox: ; 16d61d InitTradeSpeciesList: ; 16d673 call _LoadTradeScreenBorder call Function16d6ae - callba InitMG_Mobile_LinkTradePalMap - callba PlaceTradePartnerNamesAndParty + farcall InitMG_Mobile_LinkTradePalMap + farcall PlaceTradePartnerNamesAndParty hlcoord 10, 17 ld de, .CANCEL call PlaceString @@ -146,7 +146,7 @@ LinkComms_LoadPleaseWaitTextboxBorderGFX: ; 16d69a ; 16d6a7 LoadTradeRoomBGPals_: ; 16d6a7 - callba LoadTradeRoomBGPals + farcall LoadTradeRoomBGPals ret ; 16d6ae @@ -171,7 +171,7 @@ LinkTextbox: ; 16d6ca Function16d6ce: ; 16d6ce call LoadStandardMenuDataHeader call Function16d6e1 - callba WaitLinkTransfer + farcall WaitLinkTransfer call Call_ExitMenu call WaitBGMap2 ret @@ -233,7 +233,7 @@ LinkTradeMenu: ; 16d70c call .UpdateBGMapAndOAM call .loop2 jr nc, .done - callba _2DMenuInterpretJoypad + farcall _2DMenuInterpretJoypad jr c, .done ld a, [w2DMenuFlags1] bit 7, a @@ -352,7 +352,7 @@ LinkTradeMenu: ; 16d70c ld a, [w2DMenuFlags1] bit 6, a jr z, .skip_anims - callba PlaySpriteAnimationsAndDelayFrame + farcall PlaySpriteAnimationsAndDelayFrame .skip_anims call JoyTextDelay call .GetJoypad diff --git a/engine/mail.asm b/engine/mail.asm index 840e0a925..392405b20 100755 --- a/engine/mail.asm +++ b/engine/mail.asm @@ -2,7 +2,7 @@ SendMailToPC: ; 4456e ld a, MON_ITEM call GetPartyParamLocation ld d, [hl] - callba ItemIsMail + farcall ItemIsMail jr nc, .full call GetMailboxCount cp MAILBOX_CAPACITY @@ -80,7 +80,7 @@ ReadMailMessage: ; 445f4 call AddNTimes ld d, h ld e, l - callba ReadAnyMail + farcall ReadAnyMail ret MoveMailFromPCToParty: ; 44607 @@ -127,7 +127,7 @@ GetMailboxCount: ; 44648 CheckPokeItem:: ; 44654 push bc push de - callba SelectMonFromParty + farcall SelectMonFromParty ld a, $2 jr c, .pop_return @@ -136,7 +136,7 @@ CheckPokeItem:: ; 44654 ld bc, PARTYMON_STRUCT_LENGTH call AddNTimes ld d, [hl] - callba ItemIsMail + farcall ItemIsMail ld a, $3 jr nc, .pop_return @@ -172,12 +172,12 @@ CheckPokeItem:: ; 44654 jr nz, .loop .done - callba CheckCurPartyMonFainted + farcall CheckCurPartyMonFainted ld a, $4 jr c, .close_sram_return xor a ld [wPokemonWithdrawDepositParameter], a - callba RemoveMonFromPartyOrBox + farcall RemoveMonFromPartyOrBox ld a, $1 .close_sram_return @@ -296,7 +296,7 @@ IsAnyMonHoldingMail: ; 44781 ld d, [hl] push hl push de - callba ItemIsMail + farcall ItemIsMail pop de pop hl ret c @@ -503,15 +503,15 @@ MailboxPC: ; 0x44806 ld [PartyMenuActionText], a call ClearBGPalettes .try_again - callba LoadPartyMenuGFX - callba InitPartyMenuWithCancel - callba InitPartyMenuGFX - callba WritePartyMenuTilemap - callba PrintPartyMenuText + farcall LoadPartyMenuGFX + farcall InitPartyMenuWithCancel + farcall InitPartyMenuGFX + farcall WritePartyMenuTilemap + farcall PrintPartyMenuText call WaitBGMap call SetPalettes call DelayFrame - callba PartyMenuSelect + farcall PartyMenuSelect jr c, .exit2 ld a, [CurPartySpecies] cp EGG diff --git a/engine/main_menu.asm b/engine/main_menu.asm index c3b30d2d0..92a16f5b6 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -271,7 +271,7 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09 decoord 4, 16 ld a, [hHours] ld c, a - callba PrintHour + farcall PrintHour ld [hl], ":" inc hl ld de, hMinutes @@ -341,21 +341,21 @@ Function49ed0: ; 49ed0 MainMenu_NewGame: ; 49ee0 - callba NewGame + farcall NewGame ret ; 49ee7 MainMenu_Options: ; 49ee7 - callba OptionsMenu + farcall OptionsMenu ret ; 49eee MainMenu_Continue: ; 49eee - callba Continue + farcall Continue ret ; 49ef5 MainMenu_MysteryGift: ; 49ef5 - callba MysteryGift + farcall MysteryGift ret ; 49efc diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 4b8adb75f..971435fb0 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -1699,7 +1699,7 @@ StepType0f: ; 4ecd add hl, bc ld a, [hl] ld b, a - callba CopyDECoordsToMapObject + farcall CopyDECoordsToMapObject pop bc ld hl, OBJECT_FLAGS2 add hl, bc @@ -2177,7 +2177,7 @@ InitTempObject: ; 55ac ret nc ld d, h ld e, l - callba CopyTempObjectToObjectStruct + farcall CopyTempObjectToObjectStruct ret ; 55b9 @@ -2306,7 +2306,7 @@ Function565c: ; 565c call Function56a3 jr c, SetFacing_Standing call Function5688 - callba Function4440 + farcall Function4440 xor a ret ; 5673 @@ -2314,7 +2314,7 @@ Function565c: ; 565c Function5673: ; 5673 call Function56a3 jr c, SetFacing_Standing - callba Function4440 ; no need to farcall + farcall Function4440 ; no need to farcall xor a ret ; 5680 @@ -2340,7 +2340,7 @@ Function5688: ; 5688 ld hl, OBJECT_NEXT_TILE add hl, bc ld [hl], a - callba UpdateTallGrassFlags ; no need to farcall + farcall UpdateTallGrassFlags ; no need to farcall ret ; 56a3 @@ -2527,7 +2527,7 @@ RefreshPlayerSprite: ; 579d ld [wPlayerTurningDirection], a ld [PlayerObjectStepFrame], a call .TryResetPlayerAction - callba CheckWarpFacingDown + farcall CheckWarpFacingDown call c, SpawnInFacingDown call .SpawnInCustomFacing ret @@ -2596,7 +2596,7 @@ StartFollow:: ; 5803 ret c ld a, c call SetFollowerIfVisible - callba QueueFollowerFirstStep + farcall QueueFollowerFirstStep ret ; 5815 @@ -2642,7 +2642,7 @@ ResetFollower: ; 5847 cp -1 ret z call GetObjectStruct - callba Function58e3 ; no need to bankswitch + farcall Function58e3 ; no need to bankswitch ld a, -1 ld [wObjectFollow_Follower], a ret diff --git a/engine/map_setup.asm b/engine/map_setup.asm index 72fe9c07f..6360178e1 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -308,8 +308,8 @@ SuspendMapAnims: ; 154d3 LoadObjectsRunCallback_02: ; 154d7 ld a, MAPCALLBACK_OBJECTS call RunMapCallback - callba LoadObjectMasks - callba InitializeVisibleSprites + farcall LoadObjectMasks + farcall InitializeVisibleSprites ret ; 154ea (5:54ea) @@ -409,7 +409,7 @@ FadeOldMapMusic: ; 15567 ; 1556d RetainOldPalettes: ; 1556d - callba _UpdateTimePals + farcall _UpdateTimePals ret RotatePalettesRightMapAndMusic: ; 15574 diff --git a/engine/mart.asm b/engine/mart.asm index b091c9ef1..55c184737 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -252,7 +252,7 @@ GetMartItemPrice: ; 15be5 ; Return the price of item a in BCD at hl and in tiles at StringBuffer1. push hl ld [CurItem], a - callba GetItemPrice + farcall GetItemPrice pop hl GetMartPrice: ; 15bf0 @@ -344,7 +344,7 @@ INCLUDE "data/items/bargain_shop.asm" BuyMenu: ; 15c62 call FadeToMenu - callba BlankScreen + farcall BlankScreen xor a ld [wMenuScrollPositionBackup], a ld a, 1 @@ -443,7 +443,7 @@ GetMartDialogGroup: ; 15ca3 BuyMenuLoop: ; 15cef - callba PlaceMoneyTopRight + farcall PlaceMoneyTopRight call UpdateSprites ld hl, MenuDataHeader_Buy call CopyMenuDataHeader @@ -519,7 +519,7 @@ StandardMartAskPurchaseQuantity: ld [wItemQuantityBuffer], a ld a, MARTTEXT_HOW_MANY call LoadBuyMenuText - callba SelectQuantityToBuy + farcall SelectQuantityToBuy call ExitMenu ret ; 15d97 @@ -579,7 +579,7 @@ RooftopSaleAskPurchaseQuantity: call .GetSalePrice ld a, 99 ld [wItemQuantityBuffer], a - callba RooftopSale_SelectQuantityToBuy + farcall RooftopSale_SelectQuantityToBuy call ExitMenu ret ; 15df9 @@ -782,9 +782,9 @@ Text_Pharmacist_ComeAgain: ; 0x15eae SellMenu: ; 15eb3 call DisableSpriteUpdates - callba DepositSellInitPackBuffers + farcall DepositSellInitPackBuffers .loop - callba DepositSellPack + farcall DepositSellPack ld a, [wcf66] and a jp z, .quit @@ -812,7 +812,7 @@ SellMenu: ; 15eb3 .TryToSellItem: ; 15ee0 - callba CheckItemMenu + farcall CheckItemMenu ld a, [wItemAttributeParamBuffer] ld hl, .dw rst JumpTable @@ -835,7 +835,7 @@ SellMenu: ; 15eb3 .try_sell ; 15efd - callba _CheckTossableItem + farcall _CheckTossableItem ld a, [wItemAttributeParamBuffer] and a jr z, .okay_to_sell @@ -847,8 +847,8 @@ SellMenu: ; 15eb3 .okay_to_sell ld hl, Text_Mart_SellHowMany call PrintText - callba PlaceMoneyAtTopLeftOfTextbox - callba SelectQuantityToSell + farcall PlaceMoneyAtTopLeftOfTextbox + farcall SelectQuantityToSell call ExitMenu jr c, .declined hlcoord 1, 14 @@ -871,7 +871,7 @@ SellMenu: ; 15eb3 ld hl, Text_Mart_SoldForAmount call PrintTextBoxText call PlayTransactionSound - callba PlaceMoneyBottomLeft + farcall PlaceMoneyBottomLeft call JoyWaitAorB .declined diff --git a/engine/menu.asm b/engine/menu.asm index e84d8d597..6fbed2848 100755 --- a/engine/menu.asm +++ b/engine/menu.asm @@ -16,7 +16,7 @@ _InterpretBattleMenu:: ; 24022 rst FarCall call Draw2DMenu - callba MobileTextBorder + farcall MobileTextBorder call UpdateSprites call ApplyTilemap call Get2DMenuSelection @@ -29,7 +29,7 @@ _InterpretMobileMenu:: ; 2403c rst FarCall call Draw2DMenu - callba MobileTextBorder + farcall MobileTextBorder call UpdateSprites call ApplyTilemap call Init2DMenuCursorPosition @@ -37,7 +37,7 @@ _InterpretMobileMenu:: ; 2403c set 7, [hl] .loop call DelayFrame - callba Function10032e + farcall Function10032e ld a, [wcd2b] and a jr nz, .quit @@ -322,7 +322,7 @@ Function241d5: ; 241d5 call AdvanceMobileInactivityTimerAndCheckExpired ; BUG: This function is in another bank. ; Pointer in current bank (9) is bogus. ret c - callba Function100337 + farcall Function100337 ret c ld a, [w2DMenuFlags1] bit 7, a @@ -382,7 +382,7 @@ Menu_WasButtonPressed: ; 24259 ld a, [w2DMenuFlags1] bit 6, a jr z, .skip_to_joypad - callab PlaySpriteAnimationsAndDelayFrame + callfar PlaySpriteAnimationsAndDelayFrame .skip_to_joypad call JoyTextDelay diff --git a/engine/menu_2.asm b/engine/menu_2.asm index 13568f3c5..d88b75152 100644 --- a/engine/menu_2.asm +++ b/engine/menu_2.asm @@ -11,7 +11,7 @@ PlaceMenuItemQuantity: ; 0x24ac3 push de ld a, [MenuSelection] ld [CurItem], a - callba _CheckTossableItem + farcall _CheckTossableItem ld a, [wItemAttributeParamBuffer] pop hl and a diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm index 18dc4f94b..965d9f0ef 100755 --- a/engine/mon_icons.asm +++ b/engine/mon_icons.asm @@ -66,7 +66,7 @@ LoadMenuMonIcon: ; 8e83f push hl push bc ld d, a - callab ItemIsMail + callfar ItemIsMail pop bc pop hl jr c, .not_mail @@ -140,7 +140,7 @@ PartyMenu_InitAnimatedMonIcon: ; 8e8d5 (23:68d5) push hl push bc ld d, a - callab ItemIsMail + callfar ItemIsMail pop bc pop hl jr c, .mail @@ -204,7 +204,7 @@ SetPartyMonIconAnimSpeed: ; 8e936 (23:6936) ret .getspeed ; 8e94c (23:694c) - callba PlacePartymonHPBar + farcall PlacePartymonHPBar call GetHPPal ld e, d ld d, 0 diff --git a/engine/mon_menu.asm b/engine/mon_menu.asm index fbeffe3ed..dc6cd5cc8 100755 --- a/engine/mon_menu.asm +++ b/engine/mon_menu.asm @@ -39,7 +39,7 @@ MonSubmenu: ; 24d19 xor a ld [hBGMapMode], a call GetMonSubmenuItems - callba FreezeMonIcons + farcall FreezeMonIcons ld hl, .MenuDataHeader call LoadMenuDataHeader call .GetTopCoord @@ -202,7 +202,7 @@ GetMonSubmenuItems: ; 24dd4 ld a, MON_ITEM call GetPartyParamLocation ld d, [hl] - callba ItemIsMail + farcall ItemIsMail pop hl ld a, MONMENU_MAIL jr c, .ok diff --git a/engine/mon_stats.asm b/engine/mon_stats.asm index ec468be16..a3039eefd 100644 --- a/engine/mon_stats.asm +++ b/engine/mon_stats.asm @@ -276,7 +276,7 @@ ListMovePP: ; 50c50 push af ld [hl], b push hl - callab GetMaxPPOfMove + callfar GetMaxPPOfMove pop hl pop af ld [hl], a diff --git a/engine/move_mon.asm b/engine/move_mon.asm index 2a5baac50..2225a80ab 100755 --- a/engine/move_mon.asm +++ b/engine/move_mon.asm @@ -136,7 +136,7 @@ endr push de ld a, [CurPartyLevel] ld d, a - callab CalcExpAtLevel + callfar CalcExpAtLevel pop de ld a, [hProduct + 1] ld [de], a @@ -160,7 +160,7 @@ endr and $f jr z, .generateDVs push hl - callba GetTrainerDVs + farcall GetTrainerDVs pop hl jr .initializetrainermonstats @@ -312,7 +312,7 @@ endr ld bc, PARTYMON_STRUCT_LENGTH call AddNTimes predef GetUnownLetter - callab UpdateUnownDex + callfar UpdateUnownDex .done scf ; When this function returns, the carry flag indicates success vs failure. @@ -423,7 +423,7 @@ AddTempmonToParty: ; da96 ld bc, PARTYMON_STRUCT_LENGTH call AddNTimes predef GetUnownLetter - callab UpdateUnownDex + callfar UpdateUnownDex ld a, [wFirstUnownSeen] and a jr nz, .done @@ -598,7 +598,7 @@ SentGetPkmnIntoFromBox: ; db3f add $2 ld [MonType], a predef CopyPkmnToTempMon - callab CalcLevel + callfar CalcLevel ld a, d ld [CurPartyLevel], a pop hl @@ -708,7 +708,7 @@ RestorePPofDepositedPokemon: ; dcb6 push bc push hl push de - callba GetMaxPPOfMove + farcall GetMaxPPOfMove pop de pop hl ld a, [wd265] @@ -844,10 +844,10 @@ Functiondd64: ; dd64 ld a, [PartyCount] dec a ld [CurPartyMon], a - callba HealPartyMon + farcall HealPartyMon ld a, [CurPartyLevel] ld d, a - callab CalcExpAtLevel + callfar CalcExpAtLevel pop bc ld hl, $8 add hl, bc @@ -961,7 +961,7 @@ SentPkmnIntoBox: ; de6e push de ld a, [CurPartyLevel] ld d, a - callab CalcExpAtLevel + callfar CalcExpAtLevel pop de ld a, [hProduct + 1] ld [de], a @@ -1011,7 +1011,7 @@ SentPkmnIntoBox: ; de6e jr nz, .not_unown ld hl, sBoxMon1DVs predef GetUnownLetter - callab UpdateUnownDex + callfar UpdateUnownDex .not_unown ld hl, sBoxMon1Moves @@ -1089,8 +1089,8 @@ ShiftBoxMon: ; df47 GiveEgg:: ; df8c ld a, [CurPartySpecies] push af - callab GetPreEvolution - callab GetPreEvolution + callfar GetPreEvolution + callfar GetPreEvolution ld a, [CurPartySpecies] dec a @@ -1433,7 +1433,7 @@ CalcPkmnStatC: ; e17b ld a, [hld] ld e, a ld d, [hl] - callba GetSquareRoot + farcall GetSquareRoot pop de .no_stat_exp @@ -1625,7 +1625,7 @@ GivePoke:: ; e277 .failed ld a, [CurPartySpecies] ld [TempEnemyMonSpecies], a - callab LoadEnemyMon + callfar LoadEnemyMon call SentPkmnIntoBox jp nc, .FailedToGiveMon ld a, BOXMON @@ -1706,7 +1706,7 @@ GivePoke:: ; e277 ld [hli], a ld [hl], 01001 % $100 pop bc - callba SetGiftPartyMonCaughtData + farcall SetGiftPartyMonCaughtData jr .skip_nickname .send_to_box @@ -1730,7 +1730,7 @@ GivePoke:: ; e277 call Random ld [hl], a call CloseSRAM - callba SetGiftBoxMonCaughtData + farcall SetGiftBoxMonCaughtData jr .skip_nickname .wildmon @@ -1741,13 +1741,13 @@ GivePoke:: ; e277 ld a, b and a jr z, .party - callba SetBoxMonCaughtData + farcall SetBoxMonCaughtData jr .set_caught_data .party - callba SetCaughtData + farcall SetCaughtData .set_caught_data - callba GiveANickname_YesNo + farcall GiveANickname_YesNo pop de jr c, .skip_nickname call InitNickname @@ -1791,7 +1791,7 @@ InitNickname: ; e3de pop de push de ld b, $0 - callba NamingScreen + farcall NamingScreen pop hl ld de, StringBuffer1 call InitName diff --git a/engine/move_mon_wo_mail.asm b/engine/move_mon_wo_mail.asm index d3b4e78a5..c96823d28 100755 --- a/engine/move_mon_wo_mail.asm +++ b/engine/move_mon_wo_mail.asm @@ -34,7 +34,7 @@ InsertPokemonIntoBox: ; 51322 call CopyBytes ld a, [CurPartyMon] ld b, a - callba RestorePPofDepositedPokemon + farcall RestorePPofDepositedPokemon jp CloseSRAM InsertPokemonIntoParty: ; 5138b diff --git a/engine/mystery_gift.asm b/engine/mystery_gift.asm index 8204ab332..a8bad8935 100755 --- a/engine/mystery_gift.asm +++ b/engine/mystery_gift.asm @@ -7,7 +7,7 @@ DoMysteryGift: ; 1048ba (41:48ba) ld de, .String_PressAToLink_BToCancel call PlaceString call WaitBGMap - callba PrepMysteryGiftDataToSend + farcall PrepMysteryGiftDataToSend call MysteryGift_ClearTrainerData ld a, $2 ld [wca01], a @@ -62,21 +62,21 @@ DoMysteryGift: ; 1048ba (41:48ba) cp 4 jr z, .skip_append_save call .SaveMysteryGiftTrainerName - callba RestoreMobileEventIndex - callba TrainerRankings_MysteryGift - callba BackupMobileEventIndex + farcall RestoreMobileEventIndex + farcall TrainerRankings_MysteryGift + farcall BackupMobileEventIndex .skip_append_save ld a, [wMysteryGiftPartnerSentDeco] and a jr z, .item ld a, [wMysteryGiftPartnerWhichDeco] ld c, a - callba MysteryGiftGetDecoration + farcall MysteryGiftGetDecoration push bc call MysteryGift_CheckAndSetDecorationAlreadyReceived pop bc jr nz, .item - callab GetDecorationName_c + callfar GetDecorationName_c ld h, d ld l, e ld de, StringBuffer1 @@ -89,7 +89,7 @@ DoMysteryGift: ; 1048ba (41:48ba) call GetMysteryGiftBank ld a, [wMysteryGiftPartnerWhichItem] ld c, a - callba MysteryGiftGetItemHeldEffect + farcall MysteryGiftGetItemHeldEffect ld a, c ld [sBackupMysteryGiftItem], a ld [wNamedObjectIndexBuffer], a @@ -237,7 +237,7 @@ DoMysteryGift: ; 1048ba (41:48ba) Function104a95: ; 104a95 (41:4a95) di - callba ClearChannels + farcall ClearChannels call Function104d5e .loop2 @@ -421,7 +421,7 @@ Function104bd0: ; 104bd0 (41:4bd0) ld a, [wMysteryGiftTrainerData] cp $3 jr nc, .quit - callba StagePartyDataForMysteryGift + farcall StagePartyDataForMysteryGift call MysteryGift_ClearTrainerData ld a, $26 ld [wca02], a @@ -453,7 +453,7 @@ Function104bd0: ; 104bd0 (41:4bd0) Function104c2d: ; 104c2d (41:4c2d) di - callba ClearChannels + farcall ClearChannels call Function104d5e .asm_104c37 call Function104d96 @@ -1148,7 +1148,7 @@ MysteryGift_CopyReceivedDecosToPC: ; 105091 (41:5091) pop bc jr z, .skip push bc - callab SetSpecificDecorationFlag + callfar SetSpecificDecorationFlag pop bc .skip inc c @@ -1447,7 +1447,7 @@ Function105688: ; 105688 (41:5688) ld hl, Text_ReceivedCard call PrintText ld de, wMysteryGiftTrainerData - callba Function8ac70 + farcall Function8ac70 ld a, c ld [wd265], a ld hl, Text_CardNotRegistered @@ -1663,7 +1663,7 @@ Function1057d7: ; 1057d7 (41:57d7) call EnableLCD call WaitBGMap ld b, $2 - callba GetMysteryGift_MobileAdapterLayout + farcall GetMysteryGift_MobileAdapterLayout jp SetPalettes .Load6Row: ; 1058c6 (41:58c6) diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm index 0bc613709..484bbe753 100755 --- a/engine/namingscreen.asm +++ b/engine/namingscreen.asm @@ -103,7 +103,7 @@ NamingScreen: ; 116c1 inc de hlcoord 5, 4 call PlaceString - callba GetGender + farcall GetGender jr c, .genderless ld a, "♂" jr nz, .place_gender @@ -124,7 +124,7 @@ NamingScreen: ; 116c1 ; 1178d .Player: ; 1178d (4:578d) - callba GetPlayerIcon + farcall GetPlayerIcon call .LoadSprite hlcoord 5, 2 ld de, .PlayerNameString @@ -352,14 +352,14 @@ NamingScreenJoypadLoop: ; 11915 bit 7, a jr nz, .quit call .RunJumptable - callba PlaySpriteAnimationsAndDelayFrame + farcall PlaySpriteAnimationsAndDelayFrame call .UpdateStringEntry call DelayFrame and a ret .quit - callab ClearSpriteAnims + callfar ClearSpriteAnims call ClearSprites xor a ld [hSCX], a @@ -900,7 +900,7 @@ NamingScreen_GetLastCharacter: ; 11c11 (4:5c11) LoadNamingScreenGFX: ; 11c51 call ClearSprites - callab ClearSpriteAnims + callfar ClearSpriteAnims call LoadStandardFont call LoadFontsExtra @@ -1096,14 +1096,14 @@ INCBIN "gfx/icon/mail2.2bpp" bit 7, a jr nz, .exit_mail call .DoJumptable - callba PlaySpriteAnimationsAndDelayFrame + farcall PlaySpriteAnimationsAndDelayFrame call .Update call DelayFrame and a ret .exit_mail - callab ClearSpriteAnims + callfar ClearSpriteAnims call ClearSprites xor a ld [hSCX], a diff --git a/engine/new_pokedex_entry.asm b/engine/new_pokedex_entry.asm index 012052530..acf9fca7b 100644 --- a/engine/new_pokedex_entry.asm +++ b/engine/new_pokedex_entry.asm @@ -15,11 +15,11 @@ NewPokedexEntry: ; fb877 ld [hSCX], a xor a ld [wPokedexStatus], a - callba _NewPokedexEntry + farcall _NewPokedexEntry call WaitPressAorB_BlinkCursor ld a, $1 ld [wPokedexStatus], a - callba DisplayDexEntry + farcall DisplayDexEntry call WaitPressAorB_BlinkCursor pop af ld [wPokedexStatus], a @@ -38,9 +38,9 @@ NewPokedexEntry: ; fb877 call ClearTileMap call LoadFontsExtra call LoadStandardFont - callba Pokedex_PlaceFrontpicTopLeftCorner + farcall Pokedex_PlaceFrontpicTopLeftCorner call WaitBGMap2 - callba GetEnemyMonDVs + farcall GetEnemyMonDVs ld a, [hli] ld [TempMonDVs], a ld a, [hl] diff --git a/engine/npctrade.asm b/engine/npctrade.asm index fab504ab3..1455dce62 100755 --- a/engine/npctrade.asm +++ b/engine/npctrade.asm @@ -24,7 +24,7 @@ NPCTrade:: ; fcba8 ; Select givemon from party ld b, PARTYMENUACTION_GIVE_MON - callba SelectTradeOrDayCareMon + farcall SelectTradeOrDayCareMon ld a, TRADE_CANCEL jr c, .done @@ -88,12 +88,12 @@ CheckTradeGender: ; fcc23 cp 1 jr z, .check_male - callba GetGender + farcall GetGender jr nz, .not_matching jr .matching .check_male - callba GetGender + farcall GetGender jr z, .not_matching .matching @@ -171,7 +171,7 @@ DoNPCTrade: ; fcc63 call Trade_GetAttributeOfCurrentPartymon ld b, h ld c, l - callba GetCaughtGender + farcall GetCaughtGender ld a, c ld [wPlayerTrademonCaughtData], a @@ -195,7 +195,7 @@ DoNPCTrade: ; fcc63 xor a ld [MonType], a ld [wPokemonWithdrawDepositParameter], a - callab RemoveMonFromPartyOrBox + callfar RemoveMonFromPartyOrBox predef TryAddMonToParty ld e, TRADE_DIALOG @@ -206,7 +206,7 @@ DoNPCTrade: ; fcc63 jr c, .incomplete ld b, SET_FLAG .incomplete - callba SetGiftPartyMonCaughtData + farcall SetGiftPartyMonCaughtData ld e, TRADE_NICK call GetTradeAttribute @@ -275,7 +275,7 @@ DoNPCTrade: ; fcc63 ld a, [PartyCount] dec a ld [CurPartyMon], a - callba ComputeNPCTrademonStats + farcall ComputeNPCTrademonStats pop af ld [CurPartyMon], a pop hl diff --git a/engine/odd_eggs.asm b/engine/odd_eggs.asm index 93d753dfb..5d67358f0 100644 --- a/engine/odd_eggs.asm +++ b/engine/odd_eggs.asm @@ -86,7 +86,7 @@ GiveOddEgg: ; 1fb4b6 ld [wMobileMonNicknamePointerBuffer], a ld a, wOddEggName / $100 ld [wMobileMonNicknamePointerBuffer + 1], a - callba AddMobileMonToParty + farcall AddMobileMonToParty ret ; 1fb546 diff --git a/engine/overworld.asm b/engine/overworld.asm index a085d1d5a..523021c32 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -178,14 +178,14 @@ MapCallbackSprites_LoadUsedSpritesGFX: ; 14209 ret nz ld c, EMOTE_SHADOW - callba LoadEmote + farcall LoadEmote call GetMapPermission call CheckOutdoorMap ld c, EMOTE_GRASS_RUSTLE jr z, .outdoor ld c, EMOTE_BOULDER_DUST .outdoor - callba LoadEmote + farcall LoadEmote ret ; 14236 @@ -265,7 +265,7 @@ GetMonSprite: ; 14259 and a jr z, .NoBreedmon - callba LoadOverworldMonIcon + farcall LoadOverworldMonIcon ld l, 1 ld h, 0 diff --git a/engine/pack.asm b/engine/pack.asm index 858548771..2b0d04aba 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -118,12 +118,12 @@ Pack: ; 10000 ret .TMHMPocketMenu: ; 100e8 (4:40e8) - callba TMHMPocket + farcall TMHMPocket ld b, $5 ld c, $1 call Pack_InterpretJoypad ret c - callba _CheckTossableItem + farcall _CheckTossableItem ld a, [wItemAttributeParamBuffer] and a jr nz, .use_quit @@ -192,15 +192,15 @@ Pack: ; 10000 ; 10159 .UseItem: ; 10159 - callba AskTeachTMHM + farcall AskTeachTMHM ret c - callba ChooseMonToLearnTMHM + farcall ChooseMonToLearnTMHM jr c, .declined ld hl, Options ld a, [hl] push af res NO_TEXT_SCROLL, [hl] - callba TeachTMHM + farcall TeachTMHM pop af ld [Options], a .declined @@ -240,29 +240,29 @@ Pack: ; 10000 ret .ItemBallsKey_LoadSubmenu: ; 101c5 (4:41c5) - callba _CheckTossableItem + farcall _CheckTossableItem ld a, [wItemAttributeParamBuffer] and a jr nz, .tossable - callba CheckSelectableItem + farcall CheckSelectableItem ld a, [wItemAttributeParamBuffer] and a jr nz, .selectable - callba CheckItemMenu + farcall CheckItemMenu ld a, [wItemAttributeParamBuffer] and a jr nz, .usable jr .unusable .selectable - callba CheckItemMenu + farcall CheckItemMenu ld a, [wItemAttributeParamBuffer] and a jr nz, .selectable_usable jr .selectable_unusable .tossable - callba CheckSelectableItem + farcall CheckSelectableItem ld a, [wItemAttributeParamBuffer] and a jr nz, .tossable_selectable @@ -455,7 +455,7 @@ Jumptable_GiveTossQuit: ; 1030b ; 10311 UseItem: ; 10311 - callba CheckItemMenu + farcall CheckItemMenu ld a, [wItemAttributeParamBuffer] ld hl, .dw rst JumpTable @@ -512,7 +512,7 @@ UseItem: ; 10311 TossMenu: ; 10364 ld hl, Text_ThrowAwayHowMany call Pack_PrintTextNoScroll - callba SelectQuantityToToss + farcall SelectQuantityToToss push af call ExitMenu pop af @@ -566,7 +566,7 @@ ResetPocketCursorPositions: ; 1039d ; 103c2 RegisterItem: ; 103c2 - callba CheckSelectableItem + farcall CheckSelectableItem ld a, [wItemAttributeParamBuffer] and a jr nz, .cant_register @@ -606,16 +606,16 @@ GiveItem: ; 103fd ld a, PARTYMENUACTION_GIVE_ITEM ld [PartyMenuActionText], a call ClearBGPalettes - callba LoadPartyMenuGFX - callba InitPartyMenuWithCancel - callba InitPartyMenuGFX + farcall LoadPartyMenuGFX + farcall InitPartyMenuWithCancel + farcall InitPartyMenuGFX .loop - callba WritePartyMenuTilemap - callba PrintPartyMenuText + farcall WritePartyMenuTilemap + farcall PrintPartyMenuText call WaitBGMap call SetPalettes call DelayFrame - callba PartyMenuSelect + farcall PartyMenuSelect jr c, .finish ld a, [CurPartySpecies] cp EGG @@ -786,7 +786,7 @@ BattlePack: ; 10493 ret .TMHMPocketMenu: ; 10581 (4:4581) - callba TMHMPocket + farcall TMHMPocket ld b, $5 ld c, $1 call Pack_InterpretJoypad @@ -824,7 +824,7 @@ BattlePack: ; 10493 ret ItemSubmenu: ; 105d3 (4:45d3) - callba CheckItemContext + farcall CheckItemContext ld a, [wItemAttributeParamBuffer] TMHMSubmenu: ; 105dc (4:45dc) and a @@ -890,7 +890,7 @@ TMHMSubmenu: ; 105dc (4:45dc) ; 10629 .Use: ; 10629 - callba CheckItemContext + farcall CheckItemContext ld a, [wItemAttributeParamBuffer] ld hl, .ItemFunctionJumptable rst JumpTable @@ -1043,7 +1043,7 @@ DepositSellPack: ; 106be ld a, 3 call InitPocket call WaitBGMap_DrawPackGFX - callba TMHMPocket + farcall TMHMPocket ld a, [CurItem] ld [CurItem], a ret @@ -1130,7 +1130,7 @@ TutorialPack: ; 107bb ld a, [InputType] or a jr z, .loop - callba _DudeAutoInput_RightA + farcall _DudeAutoInput_RightA .loop call .RunJumptable call DepositSellTutorial_InterpretJoypad @@ -1207,7 +1207,7 @@ TutorialPack: ; 107bb ld a, 3 call InitPocket call WaitBGMap_DrawPackGFX - callba TMHMPocket + farcall TMHMPocket ld a, [CurItem] ld [CurItem], a ret @@ -1310,7 +1310,7 @@ DrawPackGFX: ; 1089d ret .female - callba DrawKrisPackGFX + farcall DrawKrisPackGFX ret ; 108cc @@ -1377,7 +1377,7 @@ Pack_InterpretJoypad: ; 108d4 (4:48d4) ret .select - callba SwitchItemsInBag + farcall SwitchItemsInBag ld hl, Text_MoveItemWhere call Pack_PrintTextNoScroll scf @@ -1394,7 +1394,7 @@ Pack_InterpretJoypad: ; 108d4 (4:48d4) ret .place_insert - callba SwitchItemsInBag + farcall SwitchItemsInBag ld de, SFX_SWITCH_POKEMON call WaitPlaySFX ld de, SFX_SWITCH_POKEMON diff --git a/engine/party_menu.asm b/engine/party_menu.asm index 94b0bb0a2..e89fdab19 100644 --- a/engine/party_menu.asm +++ b/engine/party_menu.asm @@ -40,8 +40,8 @@ InitPartyMenuLayout: ; 5003f LoadPartyMenuGFX: ; 5004f call LoadFontsBattleExtra - callab InitPartyMenuPalettes ; engine/color.asm - callab ClearSpriteAnims2 + callfar InitPartyMenuPalettes ; engine/color.asm + callfar ClearSpriteAnims2 ret ; 5005f @@ -662,7 +662,7 @@ InitPartyMenuGFX: ; 503e0 pop bc dec c jr nz, .loop - callab PlaySpriteAnimations + callfar PlaySpriteAnimations ret ; 50405 diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index 1a26a6f5b..e49d73c1a 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -154,7 +154,7 @@ CheckPhoneCall:: ; 90074 (24:4074) ret .timecheck ; 900a6 (24:40a6) - callba CheckReceiveCallTimer + farcall CheckReceiveCallTimer ret CheckPhoneContactTimeOfDay: ; 900ad (24:40ad) @@ -163,7 +163,7 @@ CheckPhoneContactTimeOfDay: ; 900ad (24:40ad) push de push af - callba CheckTime + farcall CheckTime pop af and MORN | DAY | NITE and c @@ -201,7 +201,7 @@ ChooseRandomCaller: ; 900bf (24:40bf) ret GetAvailableCallers: ; 900de (24:40de) - callba CheckTime + farcall CheckTime ld a, c ld [EngineBuffer1], a ld hl, EngineBuffer3 @@ -471,7 +471,7 @@ UnknownScript_0x90261: ; 0x90261 RingTwice_StartCall: ; 9026f call .Ring call .Ring - callba TrainerRankings_PhoneCalls + farcall TrainerRankings_PhoneCalls ret ; 9027c @@ -500,7 +500,7 @@ PhoneCall:: ; 9029a ld [PhoneCaller + 1], a call Phone_FirstOfTwoRings call Phone_FirstOfTwoRings - callba TrainerRankings_PhoneCalls + farcall TrainerRankings_PhoneCalls ret ; 902b3 @@ -599,7 +599,7 @@ Phone_StartRinging: ; 9033f call PlaySFX call Phone_CallerTextbox call UpdateSprites - callba PhoneRing_LoadEDTile + farcall PhoneRing_LoadEDTile ret ; 90355 @@ -609,7 +609,7 @@ HangUp_Wait20Frames: ; 90355 Phone_Wait20Frames ld c, 20 call DelayFrames - callba PhoneRing_LoadEDTile + farcall PhoneRing_LoadEDTile ret ; 90363 @@ -725,7 +725,7 @@ NonTrainerCallerNames: ; 903d6 Phone_GetTrainerName: ; 90423 (24:4423) push hl push bc - callba GetTrainerName + farcall GetTrainerName pop bc pop hl ret @@ -733,7 +733,7 @@ Phone_GetTrainerName: ; 90423 (24:4423) Phone_GetTrainerClassName: ; 9042e (24:442e) push hl push bc - callba GetTrainerClassName + farcall GetTrainerClassName pop bc pop hl ret @@ -754,7 +754,7 @@ GetCallerLocation: ; 90439 push bc call GetWorldMapLocation ld e, a - callba GetLandmarkName + farcall GetLandmarkName pop bc pop de ret diff --git a/engine/play_slow_cry.asm b/engine/play_slow_cry.asm index 322fd21cc..3cc347a55 100644 --- a/engine/play_slow_cry.asm +++ b/engine/play_slow_cry.asm @@ -23,7 +23,7 @@ PlaySlowCry: ; fb841 ld [CryLength], a ld a, h ld [CryLength + 1], a - callba _PlayCryHeader + farcall _PlayCryHeader call WaitSFX .done diff --git a/engine/player_movement.asm b/engine/player_movement.asm index 34ca81fe9..db0c07801 100755 --- a/engine/player_movement.asm +++ b/engine/player_movement.asm @@ -653,7 +653,7 @@ DoPlayerMovement:: ; 80000 ld e, a ; Find an object struct with coordinates equal to d,e ld bc, ObjectStructs ; redundant - callba IsNPCAtCoord + farcall IsNPCAtCoord jr nc, .is_npc call .CheckStrengthBoulder jr c, .no_bump diff --git a/engine/player_step.asm b/engine/player_step.asm index 83158c1b7..bdd6d9907 100755 --- a/engine/player_step.asm +++ b/engine/player_step.asm @@ -77,7 +77,7 @@ HandlePlayerStep: ; d4e5 (3:54e5) ret .mobile ; d509 (3:5509) - callba TrainerRankings_StepCount + farcall TrainerRankings_StepCount ret .fail2 ; d510 (3:5510) diff --git a/engine/pokecenter_pc.asm b/engine/pokecenter_pc.asm index 8203ffa19..7045dc1c8 100755 --- a/engine/pokecenter_pc.asm +++ b/engine/pokecenter_pc.asm @@ -105,7 +105,7 @@ BillsPC: ; 15668 call PC_PlayChoosePCSound ld hl, PokecenterPCText_AccessedBillsPC call PC_DisplayText - callba _BillsPC + farcall _BillsPC and a ret ; 15679 (5:5679) @@ -124,7 +124,7 @@ OaksPC: ; 15689 call PC_PlayChoosePCSound ld hl, PokecenterPCText_AccessedOaksPC call PC_DisplayText - callba ProfOaksPC + farcall ProfOaksPC and a ret ; 1569a @@ -132,7 +132,7 @@ OaksPC: ; 15689 HallOfFamePC: ; 1569a call PC_PlayChoosePCSound call FadeToMenu - callba _HallOfFamePC + farcall _HallOfFamePC call CloseSubmenu and a ret @@ -308,7 +308,7 @@ UnknownText_0x157cc: ; 0x157cc KrisWithdrawItemMenu: ; 0x157d1 call LoadStandardMenuDataHeader - callba ClearPCItemScreen + farcall ClearPCItemScreen .loop call PCItemsJoypad jr c, .quit @@ -322,7 +322,7 @@ KrisWithdrawItemMenu: ; 0x157d1 .Submenu: ; check if the item has a quantity - callba _CheckTossableItem + farcall _CheckTossableItem ld a, [wItemAttributeParamBuffer] and a jr z, .askquantity @@ -335,7 +335,7 @@ KrisWithdrawItemMenu: ; 0x157d1 .askquantity ld hl, .HowManyText call MenuTextBox - callba SelectQuantityToToss + farcall SelectQuantityToToss call ExitMenu call ExitMenu jr c, .done @@ -384,12 +384,12 @@ KrisWithdrawItemMenu: ; 0x157d1 KrisTossItemMenu: ; 0x1585f call LoadStandardMenuDataHeader - callba ClearPCItemScreen + farcall ClearPCItemScreen .loop call PCItemsJoypad jr c, .quit ld de, PCItems - callba TossItemFromPC + farcall TossItemFromPC jr .loop .quit @@ -399,7 +399,7 @@ KrisTossItemMenu: ; 0x1585f ; 0x1587d KrisDecorationMenu: ; 0x1587d - callba _KrisDecorationMenu + farcall _KrisDecorationMenu ld a, c and a ret z @@ -418,14 +418,14 @@ KrisDepositItemMenu: ; 0x1588b jr c, .nope call DisableSpriteUpdates call LoadStandardMenuDataHeader - callba DepositSellInitPackBuffers + farcall DepositSellInitPackBuffers .loop - callba DepositSellPack + farcall DepositSellPack ld a, [wcf66] and a jr z, .close call .TryDepositItem - callba CheckRegisteredItem + farcall CheckRegisteredItem jr .loop .close @@ -436,7 +436,7 @@ KrisDepositItemMenu: ; 0x1588b ret .CheckItemsInBag: - callba HasNoItems + farcall HasNoItems ret nc ld hl, .NoItemsInBag call MenuTextBoxBackup @@ -453,7 +453,7 @@ KrisDepositItemMenu: ; 0x1588b push af ld a, $0 ld [wSpriteUpdatesEnabled], a - callba CheckItemMenu + farcall CheckItemMenu ld a, [wItemAttributeParamBuffer] ld hl, .dw rst JumpTable @@ -486,7 +486,7 @@ KrisDepositItemMenu: ; 0x1588b ret .DepositItem_: - callba _CheckTossableItem + farcall _CheckTossableItem ld a, [wItemAttributeParamBuffer] and a jr z, .AskQuantity @@ -497,7 +497,7 @@ KrisDepositItemMenu: ; 0x1588b .AskQuantity: ld hl, .HowManyText call MenuTextBox - callba SelectQuantityToToss + farcall SelectQuantityToToss push af call ExitMenu call ExitMenu @@ -545,7 +545,7 @@ KrisDepositItemMenu: ; 0x1588b db "@" KrisMailBoxMenu: ; 0x1597d - callba _KrisMailBoxMenu + farcall _KrisMailBoxMenu xor a ret ; 0x15985 @@ -605,12 +605,12 @@ PCItemsJoypad: ; 0x15985 .a_select_2 call PC_PlaySwapItemsSound .select_1 - callba SwitchItemsInBag + farcall SwitchItemsInBag .next jp .loop .a_1 - callba ScrollingMenu_ClearLeftColumn + farcall ScrollingMenu_ClearLeftColumn call PlaceHollowCursor and a ret diff --git a/engine/pokedex.asm b/engine/pokedex.asm index a7a7a4860..eef9c707a 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -98,7 +98,7 @@ InitPokedex: ; 40063 call Pokedex_OrderMonsByMode call Pokedex_InitCursorPosition call Pokedex_GetLandmark - callba DrawDexEntryScreenRightEdge + farcall DrawDexEntryScreenRightEdge call Pokedex_ResetBGMapMode ret @@ -220,7 +220,7 @@ Pokedex_InitMainScreen: ; 4013c (10:413c) hlcoord 0, 0, AttrMap ld bc, SCREEN_HEIGHT * SCREEN_WIDTH call ByteFill - callba DrawPokedexListWindow + farcall DrawPokedexListWindow hlcoord 0, 17 ld de, String_START_SEARCH call Pokedex_PlaceString @@ -250,7 +250,7 @@ Pokedex_InitMainScreen: ; 4013c (10:413c) ld a, SCGB_POKEDEX call Pokedex_GetSGBLayout call Pokedex_UpdateCursorOAM - callba DrawPokedexListWindow + farcall DrawPokedexListWindow hlcoord 0, 17 ld de, String_START_SEARCH call Pokedex_PlaceString @@ -333,7 +333,7 @@ Pokedex_InitDexEntryScreen: ; 40217 (10:4217) call Pokedex_InitArrowCursor call Pokedex_GetSelectedMon ld [wLastDexEntry], a - callba DisplayDexEntry + farcall DisplayDexEntry call Pokedex_DrawFootprint call WaitBGMap ld a, $a7 @@ -387,7 +387,7 @@ Pokedex_Page: ; 40292 ld [wPokedexStatus], a call Pokedex_GetSelectedMon ld [wLastDexEntry], a - callba DisplayDexEntry + farcall DisplayDexEntry call WaitBGMap ret @@ -403,7 +403,7 @@ Pokedex_ReinitDexEntryScreen: ; 402aa (10:42aa) call Pokedex_LoadCurrentFootprint call Pokedex_GetSelectedMon ld [wLastDexEntry], a - callba DisplayDexEntry + farcall DisplayDexEntry call Pokedex_DrawFootprint call Pokedex_LoadSelectedMonTiles call WaitBGMap @@ -481,7 +481,7 @@ DexEntryScreen_MenuActionJumptable: ; 402f2 push af ld a, [wJumptableIndex] push af - callba PrintDexEntry + farcall PrintDexEntry pop af ld [wJumptableIndex], a pop af @@ -502,7 +502,7 @@ DexEntryScreen_MenuActionJumptable: ; 402f2 Pokedex_RedisplayDexEntry: ; 4038d call Pokedex_DrawDexEntryScreenBG call Pokedex_GetSelectedMon - callba DisplayDexEntry + farcall DisplayDexEntry call Pokedex_DrawFootprint ret @@ -622,7 +622,7 @@ Pokedex_InitSearchScreen: ; 40443 (10:4443) call Pokedex_PlaceSearchScreenTypeStrings xor a ld [wDexSearchSlowpokeFrame], a - callba DoDexSearchSlowpokeFrame + farcall DoDexSearchSlowpokeFrame call WaitBGMap ld a, SCGB_POKEDEX_SEARCH_OPTION call Pokedex_GetSGBLayout @@ -675,7 +675,7 @@ Pokedex_UpdateSearchScreen: ; 40471 (10:4471) .MenuAction_BeginSearch: ; 404b7 call Pokedex_SearchForMons - callba AnimateDexSearchSlowpoke + farcall AnimateDexSearchSlowpoke ld a, [wDexSearchResultCount] and a jr nz, .show_search_results @@ -722,7 +722,7 @@ Pokedex_InitSearchResultsScreen: ; 4050a (10:450a) call ByteFill call Pokedex_SetBGMapMode4 call Pokedex_ResetBGMapMode - callba DrawPokedexSearchResultsWindow + farcall DrawPokedexSearchResultsWindow call Pokedex_PlaceSearchResultsTypeStrings ld a, 4 ld [wDexListingHeight], a @@ -738,7 +738,7 @@ Pokedex_InitSearchResultsScreen: ; 4050a (10:450a) ld [hWY], a call WaitBGMap call Pokedex_ResetBGMapMode - callba DrawPokedexSearchResultsWindow + farcall DrawPokedexSearchResultsWindow call Pokedex_PlaceSearchResultsTypeStrings call Pokedex_UpdateSearchResultsCursorOAM ld a, $ff @@ -801,7 +801,7 @@ Pokedex_InitUnownMode: ; 405bd (10:45bd) ld [wDexCurrentUnownIndex], a call Pokedex_LoadUnownFrontpicTiles call Pokedex_UnownModePlaceCursor - callba PrintUnownWord + farcall PrintUnownWord call WaitBGMap ld a, SCGB_POKEDEX_UNOWN_MODE call Pokedex_GetSGBLayout @@ -823,7 +823,7 @@ Pokedex_UpdateUnownMode: ; 405df (10:45df) call DelayFrame call Pokedex_CheckSGB jr nz, .decompress - callba LoadSGBPokedexGFX2 + farcall LoadSGBPokedexGFX2 jr .done .decompress @@ -873,7 +873,7 @@ Pokedex_UnownModeHandleDPadInput: ; 40610 (10:4610) call Pokedex_UnownModeEraseCursor call Pokedex_LoadUnownFrontpicTiles call Pokedex_UnownModePlaceCursor - callba PrintUnownWord + farcall PrintUnownWord ld a, $1 ld [hBGMapMode], a call DelayFrame @@ -2409,7 +2409,7 @@ Pokedex_LoadSelectedMonTiles: ; 4143b .QuestionMark: ld a, BANK(sScratch) call GetSRAMBank - callba LoadQuestionMarkPic + farcall LoadQuestionMarkPic ld hl, VTiles2 ld de, sScratch ld c, 7 * 7 @@ -2477,7 +2477,7 @@ Pokedex_LoadGFX: ; 414b7 call Pokedex_InvertTiles call Pokedex_CheckSGB jr nz, .LoadPokedexLZ - callba LoadSGBPokedexGFX + farcall LoadSGBPokedexGFX jr .LoadPokedexSlowpokeLZ .LoadPokedexLZ: @@ -2564,7 +2564,7 @@ Pokedex_LoadUnownFrontpicTiles: ; 41a58 (10:5a58) _NewPokedexEntry: ; 41a7f xor a ld [hBGMapMode], a - callba DrawDexEntryScreenRightEdge + farcall DrawDexEntryScreenRightEdge call Pokedex_ResetBGMapMode call DisableLCD call LoadStandardFont @@ -2581,7 +2581,7 @@ _NewPokedexEntry: ; 41a7f ld bc, 19 ld a, " " call ByteFill - callba DisplayDexEntry + farcall DisplayDexEntry call EnableLCD call WaitBGMap call GetBaseData diff --git a/engine/pokegear.asm b/engine/pokegear.asm index bf2c2b40e..d38f8c6a8 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -20,7 +20,7 @@ PokeGear: ; 90b8d (24:4b8d) bit 7, a jr nz, .done call PokegearJumptable - callba PlaySpriteAnimations + farcall PlaySpriteAnimations call DelayFrame jr .loop @@ -55,7 +55,7 @@ PokeGear: ; 90b8d (24:4b8d) ld a, $7 ld [hWX], a call Pokegear_LoadGFX - callba ClearSpriteAnims + farcall ClearSpriteAnims call InitPokegearModeIndicatorArrow ld a, 8 call SkipMusic @@ -106,7 +106,7 @@ Pokegear_LoadGFX: ; 90c4e call GetWorldMapLocation cp FAST_SHIP jr z, .ssaqua - callba GetPlayerIcon + farcall GetPlayerIcon push de ld h, d ld l, e @@ -239,7 +239,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8) .return_from_jumptable call Pokegear_FinishTilemap - callba TownMapPals + farcall TownMapPals ld a, [wcf65] and a jr nz, .kanto_0 @@ -319,7 +319,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8) .kanto ld e, 1 .ok - callba PokegearMap + farcall PokegearMap ld a, $7 ld bc, $12 hlcoord 1, 2 @@ -513,7 +513,7 @@ Pokegear_UpdateClock: ; 90f86 (24:4f86) ld a, [hMinutes] ld c, a decoord 6, 8 - callba PrintHoursMins + farcall PrintHoursMins ld hl, .DayText bccoord 6, 6 call PlaceHLTextAtBC @@ -670,7 +670,7 @@ PokegearMap_InitPlayerIcon: ; 9106a pop af ld e, a push bc - callba GetLandmarkCoords + farcall GetLandmarkCoords pop bc ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc @@ -709,9 +709,9 @@ PokegearMap_UpdateLandmarkName: ; 910b4 pop af ld e, a push de - callba GetLandmarkName + farcall GetLandmarkName pop de - callba TownMap_ConvertLineBreakCharacters + farcall TownMap_ConvertLineBreakCharacters hlcoord 8, 0 ld [hl], $34 ret @@ -721,7 +721,7 @@ PokegearMap_UpdateLandmarkName: ; 910b4 PokegearMap_UpdateCursorPosition: ; 910d4 push bc ld e, a - callba GetLandmarkCoords + farcall GetLandmarkCoords pop bc ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc @@ -929,7 +929,7 @@ PokegearPhone_MakePhoneCall: ; 911eb (24:51eb) ret .no_service - callba Phone_NoSignal + farcall Phone_NoSignal ld hl, .OutOfServiceArea call PrintText ld a, $8 @@ -958,7 +958,7 @@ PokegearPhone_FinishPhoneCall: ; 91256 (24:5256) ld a, [hJoyPressed] and A_BUTTON | B_BUTTON ret z - callba HangUp + farcall HangUp ld a, $8 ld [wJumptableIndex], a ld hl, PokegearText_WhomToCall @@ -1121,7 +1121,7 @@ PokegearPhoneContactSubmenu: ; 91342 (24:5342) ld d, 0 add hl, de ld c, [hl] - callba CheckCanDeletePhoneNumber + farcall CheckCanDeletePhoneNumber ld a, c and a jr z, .cant_delete @@ -1849,7 +1849,7 @@ _TownMap: ; 9191c call ClearSprites call DisableLCD call Pokegear_LoadGFX - callba ClearSpriteAnims + farcall ClearSpriteAnims ld a, 8 call SkipMusic ld a, $e3 @@ -1919,7 +1919,7 @@ _TownMap: ; 9191c jr nz, .pressed_down .loop2 push de - callba PlaySpriteAnimations + farcall PlaySpriteAnimations pop de call DelayFrame jr .loop @@ -1973,7 +1973,7 @@ _TownMap: ; 9191c .kanto2 ld e, $1 .okay_tilemap - callba PokegearMap + farcall PokegearMap ld a, $7 ld bc, 6 hlcoord 1, 0 @@ -1994,7 +1994,7 @@ _TownMap: ; 9191c ld [hl], $17 ld a, [wTownMapCursorLandmark] call PokegearMap_UpdateLandmarkName - callba TownMapPals + farcall TownMapPals ret ; 91a53 @@ -2116,7 +2116,7 @@ _FlyMap: ; 91af3 ld [hl], $1 xor a ld [hBGMapMode], a - callba ClearSpriteAnims + farcall ClearSpriteAnims call LoadTownMapGFX ld de, FlyMapLabelBorderGFX ld hl, VTiles2 tile $30 @@ -2138,7 +2138,7 @@ _FlyMap: ; 91af3 jr nz, .pressedA call FlyMapScroll call GetMapCursorCoordinates - callba PlaySpriteAnimations + farcall PlaySpriteAnimations call DelayFrame jr .loop @@ -2276,7 +2276,7 @@ TownMapBubble: ; 91bb5 ld de, Flypoints add hl, de ld e, [hl] - callba GetLandmarkName + farcall GetLandmarkName hlcoord 2, 1 ld de, StringBuffer1 call PlaceString @@ -2292,7 +2292,7 @@ GetMapCursorCoordinates: ; 91c17 ld de, Flypoints add hl, de ld e, [hl] - callba GetLandmarkCoords + farcall GetLandmarkCoords ld a, [wTownMapCursorCoordinates] ld c, a ld a, [wTownMapCursorCoordinates + 1] @@ -2595,7 +2595,7 @@ _Area: ; 91d11 .GetAndPlaceNest: ; 91e1e ld [wTownMapCursorLandmark], a ld e, a - callba FindNest ; load nest landmarks into TileMap[0,0] + farcall FindNest ; load nest landmarks into TileMap[0,0] decoord 0, 0 ld hl, Sprites .nestloop @@ -2605,7 +2605,7 @@ _Area: ; 91d11 push de ld e, a push hl - callba GetLandmarkCoords + farcall GetLandmarkCoords pop hl ; load into OAM ld a, d @@ -2637,7 +2637,7 @@ _Area: ; 91d11 ret c ld a, [wTownMapPlayerIconLandmark] ld e, a - callba GetLandmarkCoords + farcall GetLandmarkCoords ld c, e ld b, d ld de, .PlayerOAM @@ -2723,7 +2723,7 @@ _Area: ; 91d11 ld a, [wTownMapPlayerIconLandmark] cp FAST_SHIP jr z, .FastShip - callba GetPlayerIcon + farcall GetPlayerIcon ret .FastShip: @@ -2851,7 +2851,7 @@ TownMapMon: ; 91f7b ld [wd265], a ; Get FlyMon icon ld e, 8 ; starting tile in VRAM - callba GetSpeciesIcon + farcall GetSpeciesIcon ; Animation/palette depixel 0, 0 ld a, SPRITE_ANIM_INDEX_PARTY_MON @@ -2869,7 +2869,7 @@ TownMapMon: ; 91f7b TownMapPlayerIcon: ; 91fa6 ; Draw the player icon at town map location in a push af - callba GetPlayerIcon + farcall GetPlayerIcon ; Standing icon ld hl, VTiles0 tile $10 ld c, 4 ; # tiles @@ -2899,7 +2899,7 @@ TownMapPlayerIcon: ; 91fa6 pop af ld e, a push bc - callba GetLandmarkCoords + farcall GetLandmarkCoords pop bc ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc @@ -2945,7 +2945,7 @@ INCBIN "gfx/pokegear/flymap_label_border.1bpp" ld [hl], $1 xor a ld [hBGMapMode], a - callba ClearSpriteAnims + farcall ClearSpriteAnims call LoadTownMapGFX ld de, FlyMapLabelBorderGFX ld hl, VTiles2 tile $30 @@ -2980,7 +2980,7 @@ INCBIN "gfx/pokegear/flymap_label_border.1bpp" jr nz, .pressedA call .HandleDPad call GetMapCursorCoordinates - callba PlaySpriteAnimations + farcall PlaySpriteAnimations call DelayFrame jr .loop diff --git a/engine/print_party.asm b/engine/print_party.asm index 9bf98767b..69bda8d52 100755 --- a/engine/print_party.asm +++ b/engine/print_party.asm @@ -31,7 +31,7 @@ PrintPage1: ; 1dc1b0 ld a, [wd265] ld b, a ld c, 1 ; get page 1 - callba GetDexEntryPagePointer + farcall GetDexEntryPagePointer pop af ld a, b hlcoord 1, 11, wPrinterTileMapBuffer @@ -81,7 +81,7 @@ PrintPage2: ; 1dc213 ld a, [wd265] ld b, a ld c, 2 ; get page 2 - callba GetDexEntryPagePointer + farcall GetDexEntryPagePointer pop af hlcoord 1, 1, wPrinterTileMapBuffer ld a, b @@ -157,7 +157,7 @@ PrintPartyMonPage1: ; 1dc381 xor a ld [MonType], a - callba CopyPkmnToTempMon + farcall CopyPkmnToTempMon hlcoord 0, 7 ld b, 9 ld c, 18 @@ -241,7 +241,7 @@ PrintPartyMonPage2: ; 1dc47b call LoadFontsBattleExtra xor a ld [MonType], a - callba CopyPkmnToTempMon + farcall CopyPkmnToTempMon hlcoord 0, 0 ld b, 15 ld c, 18 @@ -316,7 +316,7 @@ Function1dc51a: ; 1dc51a ; 1dc52c Function1dc52c: ; 1dc52c - callba GetGender + farcall GetGender ld a, " " jr c, .got_gender ld a, "♂" @@ -327,7 +327,7 @@ Function1dc52c: ; 1dc52c hlcoord 17, 2 ld [hl], a ld bc, TempMonDVs - callba CheckShininess + farcall CheckShininess ret nc hlcoord 18, 2 ld [hl], "" diff --git a/engine/printer.asm b/engine/printer.asm index 777ea9269..b72f99375 100755 --- a/engine/printer.asm +++ b/engine/printer.asm @@ -68,7 +68,7 @@ PrintDexEntry: ; 8442c call Printer_StartTransmission ld a, $10 ld [wcbfa], a - callba PrintPage1 + farcall PrintPage1 call ClearTileMap ld a, %11100100 call DmgToCgbBGPals @@ -94,7 +94,7 @@ PrintDexEntry: ; 8442c call Printer_StartTransmission ld a, $3 ld [wcbfa], a - callba PrintPage2 + farcall PrintPage2 call Printer_ResetJoypadRegisters ld a, 4 ld [wPrinterQueueLength], a @@ -235,7 +235,7 @@ PrintUnownStamp: ; 84560 xor a ld [hBGMapMode], a call LoadTileMapToTempTileMap - callba PlaceUnownPrinterFrontpic + farcall PlaceUnownPrinterFrontpic ld a, $0 ; to be loaded to wcbfa call Printer_PrepareTileMapForPrint call Call_LoadTempTileMapToTileMap @@ -341,7 +341,7 @@ PrintPartymon: ; 8461a xor a ld [hBGMapMode], a - callba PrintPartyMonPage1 + farcall PrintPartyMonPage1 ld a, $10 ; to be loaded to wcbfa call Printer_PrepareTileMapForPrint @@ -362,7 +362,7 @@ PrintPartymon: ; 8461a xor a ld [hBGMapMode], a - callba PrintPartyMonPage2 + farcall PrintPartyMonPage2 ld a, $3 ; to be loaded to wcbfa call Printer_PrepareTileMapForPrint @@ -391,7 +391,7 @@ _PrintDiploma: ; 84688 ld a, [wPrinterQueueLength] push af - callba PlaceDiplomaOnScreen + farcall PlaceDiplomaOnScreen xor a ld [hPrinter], a @@ -425,7 +425,7 @@ _PrintDiploma: ; 84688 xor a ld [hBGMapMode], a - callba PrintDiplomaPage2 + farcall PrintDiplomaPage2 ld a, $3 ; to be loaded to wcbfa call Printer_PrepareTileMapForPrint @@ -861,7 +861,7 @@ Printer_GetMonGender: ; 8498a (21:498a) ld [CurPartyMon], a ld a, TEMPMON ld [MonType], a - callba GetGender + farcall GetGender ld a, " " jr c, .got_gender ld a, "♂" diff --git a/engine/radio.asm b/engine/radio.asm index 58e953e55..b5c1e075f 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -278,7 +278,7 @@ endr pop bc call GetWorldMapLocation ld e, a - callba GetLandmarkName + farcall GetLandmarkName ld hl, OPT_OakText1 call CopyRadioTextToRAM ld a, OAKS_POKEMON_TALK_5 @@ -592,7 +592,7 @@ OaksPkmnTalk9: db "@" OaksPkmnTalk10: - callba RadioMusicRestartPokemonChannel + farcall RadioMusicRestartPokemonChannel ld hl, OPT_RestartText call PrintText call WaitBGMap @@ -653,7 +653,7 @@ OaksPkmnTalk14: dec [hl] ret nz ld de, $1d - callab RadioMusicRestartDE + callfar RadioMusicRestartDE ld hl, .terminator call PrintText ld a, OAKS_POKEMON_TALK_4 @@ -923,7 +923,7 @@ StartPokemonMusicChannel: jr z, .SunTueThurSun ld de, MUSIC_POKEMON_LULLABY .SunTueThurSun: - callab RadioMusicRestartDE + callfar RadioMusicRestartDE ret BenIntroText1: @@ -978,9 +978,9 @@ BenFernText3B: LuckyNumberShow1: call StartRadioStation - callab Special_CheckLuckyNumberShowFlag + callfar Special_CheckLuckyNumberShowFlag jr nc, .dontreset - callab Special_ResetLuckyNumberShowFlag + callfar Special_ResetLuckyNumberShowFlag .dontreset ld hl, LC_Text1 ld a, LUCKY_NUMBER_SHOW_2 @@ -1193,12 +1193,12 @@ PeoplePlaces4: ; People pop bc jr c, PeoplePlaces4 push bc - callab GetTrainerClassName + callfar GetTrainerClassName ld de, StringBuffer1 call CopyName1 pop bc ld b, 1 - callab GetTrainerName + callfar GetTrainerName ld hl, PnP_Text4 ld a, PLACES_AND_PEOPLE_5 jp NextRadioLine @@ -1348,7 +1348,7 @@ PeoplePlaces6: ; Places ld c, [hl] call GetWorldMapLocation ld e, a - callba GetLandmarkName + farcall GetLandmarkName ld hl, PnP_Text5 ld a, PLACES_AND_PEOPLE_7 jp NextRadioLine @@ -1808,8 +1808,8 @@ BuenasPassword19: BuenasPassword20: ld a, [hBGMapMode] push af - callba NoRadioMusic - callba NoRadioName + farcall NoRadioMusic + farcall NoRadioName pop af ld [hBGMapMode], a ld hl, WeeklyFlags @@ -1955,7 +1955,7 @@ StartRadioStation: ld e, [hl] inc hl ld d, [hl] - callab RadioMusicRestartDE + callfar RadioMusicRestartDE ret RadioChannelSongs: diff --git a/engine/rtc.asm b/engine/rtc.asm index f69dc1f6d..e2699a637 100755 --- a/engine/rtc.asm +++ b/engine/rtc.asm @@ -143,8 +143,8 @@ Function140ae: ; 140ae jr c, .dont_update .time_overflow - callba ClearDailyTimers - callba Function170923 + farcall ClearDailyTimers + farcall Function170923 ; mobile ld a, $5 call GetSRAMBank diff --git a/engine/save.asm b/engine/save.asm index 65339e0bb..6ee92bcee 100644 --- a/engine/save.asm +++ b/engine/save.asm @@ -1,9 +1,9 @@ SaveMenu: ; 14a1a call LoadStandardMenuDataHeader - callba DisplaySaveInfoOnSave + farcall DisplaySaveInfoOnSave call SpeechTextBox call UpdateSprites - callba SaveMenu_LoadEDTile + farcall SaveMenu_LoadEDTile ld hl, Text_WouldYouLikeToSaveTheGame call SaveTheGame_yesorno jr nz, .refused @@ -19,20 +19,20 @@ SaveMenu: ; 14a1a .refused call ExitMenu call ret_d90 - callba SaveMenu_LoadEDTile + farcall SaveMenu_LoadEDTile scf ret SaveAfterLinkTrade: ; 14a58 call PauseGameLogic - callba StageRTCTimeForSave - callba BackupMysteryGift + farcall StageRTCTimeForSave + farcall BackupMysteryGift call SavePokemonData call SaveChecksum call SaveBackupPokemonData call SaveBackupChecksum - callba BackupPartyMonMail - callba SaveRTC + farcall BackupPartyMonMail + farcall SaveRTC call ResumeGameLogic ret ; 14a83 @@ -95,8 +95,8 @@ MovePkmnWOMail_InsertMon_SaveGame: ; 14ad5 ld [wCurBox], a ld a, $1 ld [wSaveFileExists], a - callba StageRTCTimeForSave - callba BackupMysteryGift + farcall StageRTCTimeForSave + farcall BackupMysteryGift call ValidateSave call SaveOptions call SavePlayerData @@ -107,9 +107,9 @@ MovePkmnWOMail_InsertMon_SaveGame: ; 14ad5 call SaveBackupPlayerData call SaveBackupPokemonData call SaveBackupChecksum - callba BackupPartyMonMail - callba BackupMobileEventIndex - callba SaveRTC + farcall BackupPartyMonMail + farcall BackupMobileEventIndex + farcall SaveRTC call LoadBox call ResumeGameLogic ld de, SFX_SAVE @@ -271,8 +271,8 @@ SavedTheGame: ; 14be6 SaveGameData_: ; 14c10 ld a, 1 ld [wSaveFileExists], a - callba StageRTCTimeForSave - callba BackupMysteryGift + farcall StageRTCTimeForSave + farcall BackupMysteryGift call ValidateSave call SaveOptions call SavePlayerData @@ -285,9 +285,9 @@ SaveGameData_: ; 14c10 call SaveBackupPokemonData call SaveBackupChecksum call UpdateStackTop - callba BackupPartyMonMail - callba BackupMobileEventIndex - callba SaveRTC + farcall BackupPartyMonMail + farcall BackupMobileEventIndex + farcall SaveRTC ld a, BANK(sBattleTowerChallengeState) call GetSRAMBank ld a, [sBattleTowerChallengeState] @@ -636,9 +636,9 @@ TryLoadSaveFile: ; 14ea5 (5:4ea5) call LoadPlayerData call LoadPokemonData call LoadBox - callba RestorePartyMonMail - callba RestoreMobileEventIndex - callba RestoreMysteryGift + farcall RestorePartyMonMail + farcall RestoreMobileEventIndex + farcall RestoreMysteryGift call ValidateBackupSave call SaveBackupOptions call SaveBackupPlayerData @@ -653,9 +653,9 @@ TryLoadSaveFile: ; 14ea5 (5:4ea5) call LoadBackupPlayerData call LoadBackupPokemonData call LoadBox - callba RestorePartyMonMail - callba RestoreMobileEventIndex - callba RestoreMysteryGift + farcall RestorePartyMonMail + farcall RestoreMobileEventIndex + farcall RestoreMysteryGift call ValidateSave call SaveOptions call SavePlayerData diff --git a/engine/scripting.asm b/engine/scripting.asm index ed6221d6e..c5b0fd982 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -35,7 +35,7 @@ WaitScript: dec [hl] ret nz - callba Function58b9 + farcall Function58b9 ld a, SCRIPT_READ ld [ScriptMode], a @@ -49,7 +49,7 @@ WaitScriptMovement: bit 7, [hl] ret nz - callba Function58b9 + farcall Function58b9 ld a, SCRIPT_READ ld [ScriptMode], a @@ -277,7 +277,7 @@ Script_special: ld e, a call GetScriptByte ld d, a - callba Special + farcall Special ret Script_ptcallasm: @@ -475,13 +475,13 @@ Script_pokepic: ld a, [ScriptVar] .ok ld [CurPartySpecies], a - callba Pokepic + farcall Pokepic ret Script_closepokepic: ; script command 0x57 - callba ClosePokepic + farcall ClosePokepic ret Script_verticalmenu: @@ -519,7 +519,7 @@ Script_battletowertext: call SetUpTextBox call GetScriptByte ld c, a - callba BattleTowerText + farcall BattleTowerText ret Script_verbosegiveitem: @@ -615,7 +615,7 @@ Script_pocketisfull: Script_specialsound: ; script command 0x88 - callba CheckItemPocket + farcall CheckItemPocket ld a, [wItemAttributeParamBuffer] cp TM_HM ld de, SFX_GET_TM @@ -628,7 +628,7 @@ Script_specialsound: GetPocketName: - callba CheckItemPocket + farcall CheckItemPocket ld a, [wItemAttributeParamBuffer] dec a ld hl, .Pockets @@ -689,7 +689,7 @@ Script_pokemart: ld d, a ld a, [ScriptBank] ld b, a - callba OpenMartDialog + farcall OpenMartDialog ret Script_elevator: @@ -705,7 +705,7 @@ Script_elevator: ld d, a ld a, [ScriptBank] ld b, a - callba Elevator + farcall Elevator ret c ld a, TRUE ld [ScriptVar], a @@ -718,7 +718,7 @@ Script_trade: call GetScriptByte ld e, a - callba NPCTrade + farcall NPCTrade ret Script_phonecall: @@ -732,13 +732,13 @@ Script_phonecall: ld d, a ld a, [ScriptBank] ld b, a - callba PhoneCall + farcall PhoneCall ret Script_hangup: ; script command 0x99 - callba HangUp + farcall HangUp ret Script_askforphonenumber: @@ -750,7 +750,7 @@ Script_askforphonenumber: jr c, .refused call GetScriptByte ld c, a - callba AddPhoneNumber + farcall AddPhoneNumber jr c, .phonefull xor a jr .done @@ -771,7 +771,7 @@ Script_describedecoration: call GetScriptByte ld b, a - callba DescribeDecoration + farcall DescribeDecoration ld h, d ld l, e jp ScriptJump @@ -800,7 +800,7 @@ Script_swarm: ld d, a call GetScriptByte ld e, a - callba StoreSwarmMapIndices + farcall StoreSwarmMapIndices ret Script_trainertext: @@ -897,7 +897,7 @@ Script_encountermusic: ld a, [OtherTrainerClass] ld e, a - callba PlayTrainerEncounterMusic + farcall PlayTrainerEncounterMusic ret Script_playmapmusic: @@ -959,7 +959,7 @@ Script_waitsfx: Script_warpsound: ; script command 0x87 - callba GetWarpSFX + farcall GetWarpSFX call PlaySFX ret @@ -1010,7 +1010,7 @@ Script_applymovement: ApplyMovement: push bc ld a, c - callba SetFlagsForMovement_1 + farcall SetFlagsForMovement_1 pop bc push bc @@ -1032,7 +1032,7 @@ ApplyMovement: ret SetFlagsForMovement_2: - callba _SetFlagsForMovement_2 + farcall _SetFlagsForMovement_2 ret Script_applymovement2: @@ -1054,7 +1054,7 @@ Script_faceplayer: ld d, $0 ld a, [hLastTalked] ld e, a - callba GetRelativeFacing + farcall GetRelativeFacing ld a, d add a add a @@ -1085,7 +1085,7 @@ Script_faceperson: .ok2 ld d, a push de - callba GetRelativeFacing + farcall GetRelativeFacing pop bc ret c ld a, d @@ -1204,7 +1204,7 @@ Script_disappear: ld a, [hMapObjectIndexBuffer] ld b, 1 ; set call ApplyEventActionAppearDisappear - callba _UpdateSprites + farcall _UpdateSprites ret ApplyEventActionAppearDisappear: @@ -1239,13 +1239,13 @@ Script_follow: call GetScriptByte call GetScriptPerson ld c, a - callba StartFollow + farcall StartFollow ret Script_stopfollow: ; script command 0x71 - callba StopFollow + farcall StopFollow ret Script_moveperson: @@ -1264,7 +1264,7 @@ Script_moveperson: call GetScriptByte add 4 ld e, a - callba CopyDECoordsToMapObject + farcall CopyDECoordsToMapObject ret Script_writepersonxy: @@ -1279,7 +1279,7 @@ Script_writepersonxy: ld a, [hLastTalked] .ok ld b, a - callba WritePersonXY + farcall WritePersonXY ret Script_follownotexact: @@ -1294,7 +1294,7 @@ Script_follownotexact: call GetScriptByte call GetScriptPerson ld c, a - callba FollowNotExact + farcall FollowNotExact ret Script_loademote: @@ -1308,7 +1308,7 @@ Script_loademote: ld a, [ScriptVar] .not_var_emote ld c, a - callba LoadEmote + farcall LoadEmote ret Script_showemote: @@ -1451,7 +1451,7 @@ Script_catchtutorial: call GetScriptByte ld [BattleType], a call BufferScreen - callba CatchTutorial + farcall CatchTutorial jp Script_reloadmap Script_reloadmapafterbattle: @@ -1471,7 +1471,7 @@ Script_reloadmapafterbattle: .notblackedout bit 0, d jr z, .was_wild - callba MomTriesToBuySomething + farcall MomTriesToBuySomething jr .done .was_wild @@ -1480,7 +1480,7 @@ Script_reloadmapafterbattle: jr z, .done ld b, BANK(Script_SpecialBillCall) ld de, Script_SpecialBillCall - callba LoadScriptBDE + farcall LoadScriptBDE .done jp Script_reloadmap @@ -1969,7 +1969,7 @@ Script_writecode: GetVarAction: ld c, a - callba _GetVarAction + farcall _GetVarAction ret Script_checkver: @@ -2040,7 +2040,7 @@ Script_mapnametotext: ConvertLandmarkToText: ld e, a - callba GetLandmarkName + farcall GetLandmarkName ld de, StringBuffer1 jp ConvertMemToText @@ -2064,7 +2064,7 @@ Script_trainertotext: ld c, a call GetScriptByte ld b, a - callba GetTrainerName + farcall GetTrainerName jr ConvertMemToText Script_name: @@ -2176,7 +2176,7 @@ Script_givepokeitem: ld a, [ScriptBank] call FarCopyBytes pop bc - callba GivePokeItem + farcall GivePokeItem ret Script_checkpokeitem: @@ -2190,7 +2190,7 @@ Script_checkpokeitem: ld d, a ld a, [ScriptBank] ld b, a - callba CheckPokeItem + farcall CheckPokeItem ret Script_giveitem: @@ -2263,7 +2263,7 @@ Script_givemoney: call GetMoneyAccount call LoadMoneyAmountToMem - callba GiveMoney + farcall GiveMoney ret Script_takemoney: @@ -2274,7 +2274,7 @@ Script_takemoney: call GetMoneyAccount call LoadMoneyAmountToMem - callba TakeMoney + farcall TakeMoney ret Script_checkmoney: @@ -2285,7 +2285,7 @@ Script_checkmoney: call GetMoneyAccount call LoadMoneyAmountToMem - callba CompareMoney + farcall CompareMoney CompareMoneyAction: jr c, .two @@ -2329,7 +2329,7 @@ Script_givecoins: ; coins (CoinByteParam) call LoadCoinAmountToMem - callba GiveCoins + farcall GiveCoins ret Script_takecoins: @@ -2338,7 +2338,7 @@ Script_takecoins: ; coins (CoinByteParam) call LoadCoinAmountToMem - callba TakeCoins + farcall TakeCoins ret Script_checkcoins: @@ -2347,7 +2347,7 @@ Script_checkcoins: ; coins (CoinByteParam) call LoadCoinAmountToMem - callba CheckCoins + farcall CheckCoins jr CompareMoneyAction LoadCoinAmountToMem: @@ -2365,7 +2365,7 @@ Script_checktime: xor a ld [ScriptVar], a - callba CheckTime + farcall CheckTime call GetScriptByte and c ret z @@ -2398,7 +2398,7 @@ Script_addcellnum: ld [ScriptVar], a call GetScriptByte ld c, a - callba AddPhoneNumber + farcall AddPhoneNumber ret nc ld a, TRUE ld [ScriptVar], a @@ -2413,7 +2413,7 @@ Script_delcellnum: ld [ScriptVar], a call GetScriptByte ld c, a - callba DelCellNum + farcall DelCellNum ret nc ld a, TRUE ld [ScriptVar], a @@ -2429,7 +2429,7 @@ Script_checkcellnum: ld [ScriptVar], a call GetScriptByte ld c, a - callba CheckCellNum + farcall CheckCellNum ret nc ld a, TRUE ld [ScriptVar], a @@ -2487,7 +2487,7 @@ Script_givepoke: call GetScriptByte call GetScriptByte .ok - callba GivePoke + farcall GivePoke ld a, b ld [ScriptVar], a ret @@ -2506,7 +2506,7 @@ Script_giveegg: ld [CurPartySpecies], a call GetScriptByte ld [CurPartyLevel], a - callba GiveEgg + farcall GiveEgg ret nc ld a, 2 ld [ScriptVar], a @@ -2603,7 +2603,7 @@ Script_checkflag: ret _EngineFlagAction: - callba EngineFlagAction + farcall EngineFlagAction ret Script_wildoff: @@ -2735,7 +2735,7 @@ Script_writecmdqueue: ld d, a ld a, [ScriptBank] ld b, a - callba WriteCmdQueue ; no need to farcall + farcall WriteCmdQueue ; no need to farcall ret Script_delcmdqueue: @@ -2747,7 +2747,7 @@ Script_delcmdqueue: ld [ScriptVar], a call GetScriptByte ld b, a - callba DelCmdQueue ; no need to farcall + farcall DelCmdQueue ; no need to farcall ret c ld a, 1 ld [ScriptVar], a @@ -2794,7 +2794,7 @@ Script_reloadmappart:: ld [hBGMapMode], a call OverworldTextModeSwitch call GetMovementPermissions - callba ReloadMapPart + farcall ReloadMapPart call UpdateSprites ret @@ -2803,11 +2803,11 @@ Script_warpcheck: call WarpCheck ret nc - callba EnableEvents + farcall EnableEvents ret Script_enableevents: ; unreferenced - callba EnableEvents + farcall EnableEvents ret Script_newloadmap: @@ -2993,9 +2993,9 @@ Script_halloffame: ld hl, GameTimerPause res 0, [hl] - callba TrainerRankings_HallOfFame - callba TrainerRankings_HallOfFame2 - callba HallOfFame + farcall TrainerRankings_HallOfFame + farcall TrainerRankings_HallOfFame2 + farcall HallOfFame ld hl, GameTimerPause set 0, [hl] jr ReturnFromCredits @@ -3003,7 +3003,7 @@ Script_halloffame: Script_credits: ; script command 0xa2 - callba RedCredits + farcall RedCredits ReturnFromCredits: call Script_end_all ld a, $3 @@ -3031,7 +3031,7 @@ Script_wait: Script_check_save: ; script command 0xa9 - callba CheckSave + farcall CheckSave ld a, c ld [ScriptVar], a ret diff --git a/engine/select_menu.asm b/engine/select_menu.asm index 5d3b5ff0a..e92c3ee50 100755 --- a/engine/select_menu.asm +++ b/engine/select_menu.asm @@ -120,7 +120,7 @@ CheckRegisteredItem: ; 13345 UseRegisteredItem: ; 133c3 - callba CheckItemMenu + farcall CheckItemMenu ld a, [wItemAttributeParamBuffer] ld hl, .SwitchTo rst JumpTable diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index e23b760cd..383573c03 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -20,7 +20,7 @@ _SlotMachine: call PlaySFX call WaitSFX call ClearBGPalettes - callba TrainerRankings_EndSlotsWinStreak + farcall TrainerRankings_EndSlotsWinStreak ld hl, Options res NO_TEXT_SCROLL, [hl] ld hl, rLCDC ; $ff40 @@ -41,7 +41,7 @@ _SlotMachine: call ByteFill ld b, SCGB_SLOT_MACHINE call GetSGBLayout - callab ClearSpriteAnims + callfar ClearSpriteAnims ld hl, wSlots ld bc, wSlotsDataEnd - wSlots xor a @@ -116,7 +116,7 @@ SlotsLoop: ; 927af (24:67af) call Slots_SpinReels xor a ld [wCurrSpriteOAMAddr], a - callab DoNextFrameForFirst16Sprites + callfar DoNextFrameForFirst16Sprites call .PrintCoinsAndPayout call .DummyFunc call DelayFrame @@ -1812,7 +1812,7 @@ SlotGetPayout: ; 93124 (24:7124) ld a, [hl] ld [wPayout], a ld d, a - callba TrainerRankings_AddToSlotsPayouts + farcall TrainerRankings_AddToSlotsPayouts ret .PayoutTable: @@ -1836,7 +1836,7 @@ SlotPayoutText: ; 93158 (24:7158) jr nz, .MatchedSomething ld hl, .Text_Darn call PrintText - callba TrainerRankings_EndSlotsWinStreak + farcall TrainerRankings_EndSlotsWinStreak ret .MatchedSomething: @@ -1860,7 +1860,7 @@ SlotPayoutText: ; 93158 (24:7158) .return ld hl, .Text_PrintPayout call PrintText - callba TrainerRankings_AddToSlotsWinStreak + farcall TrainerRankings_AddToSlotsWinStreak ret ; 93195 (24:7195) @@ -2001,7 +2001,7 @@ SlotMachine_AnimateGolem: ; 9321d (24:721d) dec [hl] ld e, a ld d, 14 * 8 - callba BattleAnim_Sine_e + farcall BattleAnim_Sine_e ld a, e ld hl, SPRITEANIMSTRUCT_YOFFSET add hl, bc diff --git a/engine/specials.asm b/engine/specials.asm index e4f4533c6..95f7cdf03 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -200,7 +200,7 @@ SpecialNone: ; c224 Special_SetPlayerPalette: ; c225 ld a, [ScriptVar] ld d, a - callba SetPlayerPalette + farcall SetPlayerPalette ret ; c230 @@ -215,7 +215,7 @@ Special_GameCornerPrizeMonCheckDex: ; c230 call FadeToMenu ld a, [ScriptVar] ld [wd265], a - callba NewPokedexEntry + farcall NewPokedexEntry call ExitAllMenus ret ; c252 @@ -230,28 +230,28 @@ SpecialSeenMon: ; c252 Special_FindGreaterThanThatLevel: ; c25a ld a, [ScriptVar] ld b, a - callba _FindGreaterThanThatLevel + farcall _FindGreaterThanThatLevel jr z, FoundNone jr FoundOne Special_FindAtLeastThatHappy: ; c268 ld a, [ScriptVar] ld b, a - callba _FindAtLeastThatHappy + farcall _FindAtLeastThatHappy jr z, FoundNone jr FoundOne Special_FindThatSpecies: ; c276 ld a, [ScriptVar] ld b, a - callba _FindThatSpecies + farcall _FindThatSpecies jr z, FoundNone jr FoundOne Special_FindThatSpeciesYourTrainerID: ; c284 ld a, [ScriptVar] ld b, a - callba _FindThatSpeciesYourTrainerID + farcall _FindThatSpeciesYourTrainerID jr z, FoundNone jr FoundOne @@ -269,7 +269,7 @@ FoundNone: ; c298 SpecialNameRival: ; 0xc29d ld b, $2 ; rival ld de, RivalName - callba _NamingScreen + farcall _NamingScreen ; default to "SILVER" ld hl, RivalName ld de, DefaultRivalName @@ -281,27 +281,27 @@ DefaultRivalName: ; 0xc2b2 db "SILVER@" SpecialNameRater: ; c2b9 - callba NameRater + farcall NameRater ret ; c2c0 Special_TownMap: ; c2c0 call FadeToMenu - callba _TownMap + farcall _TownMap call ExitAllMenus ret ; c2cd Special_UnownPrinter: ; c2cd call FadeToMenu - callba UnownPrinter + farcall UnownPrinter call ExitAllMenus ret ; c2da Special_DisplayLinkRecord: ; c2da call FadeToMenu - callba DisplayLinkRecord + farcall DisplayLinkRecord call ExitAllMenus ret ; c2e7 @@ -309,7 +309,7 @@ Special_DisplayLinkRecord: ; c2da Special_KrissHousePC: ; c2e7 xor a ld [ScriptVar], a - callba _KrissHousePC + farcall _KrissHousePC ld a, c ld [ScriptVar], a ret @@ -365,7 +365,7 @@ Special_GetMysteryGiftItem: ; c309 ; 0xc34a BugContestJudging: ; c34a - callba _BugContestJudging + farcall _BugContestJudging ld a, b ld [ScriptVar], a ret @@ -374,13 +374,13 @@ BugContestJudging: ; c34a MapRadio: ; c355 ld a, [ScriptVar] ld e, a - callba PlayRadio + farcall PlayRadio ret ; c360 Special_UnownPuzzle: ; c360 call FadeToMenu - callba UnownPuzzle + farcall UnownPuzzle ld a, [wSolvedUnownPuzzle] ld [ScriptVar], a call ExitAllMenus @@ -485,7 +485,7 @@ ScriptReturnCarry: ; c3e2 ; c3ef Special_CheckUnusedTwoDayTimer: ; c3ef - callba CheckUnusedTwoDayTimer + farcall CheckUnusedTwoDayTimer ld a, [wUnusedTwoDayTimer] ld [ScriptVar], a ret @@ -520,20 +520,20 @@ StoreSwarmMapIndices:: ; c403 SpecialCheckPokerus: ; c419 ; Check if a monster in your party has Pokerus - callba CheckPokerus + farcall CheckPokerus jp ScriptReturnCarry ; c422 Special_ResetLuckyNumberShowFlag: ; c422 - callba RestartLuckyNumberCountdown + farcall RestartLuckyNumberCountdown ld hl, wLuckyNumberShowFlag res 0, [hl] - callba LoadOrRegenerateLuckyIDNumber + farcall LoadOrRegenerateLuckyIDNumber ret ; c434 Special_CheckLuckyNumberShowFlag: ; c434 - callba CheckLuckyNumberShowFlag + farcall CheckLuckyNumberShowFlag jp ScriptReturnCarry ; c43d @@ -628,14 +628,14 @@ Special_FadeOutMusic: ; c48f Diploma: ; c49f call FadeToMenu - callba _Diploma + farcall _Diploma call ExitAllMenus ret ; c4ac PrintDiploma: ; c4ac call FadeToMenu - callba _PrintDiploma + farcall _PrintDiploma call ExitAllMenus ret ; c4b9 diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm index 32c91b07f..1b3fb9a0d 100755 --- a/engine/sprite_anims.asm +++ b/engine/sprite_anims.asm @@ -218,15 +218,15 @@ DoAnimFrame: ; 8d24b ret .NamingScreenCursor ; 8d36c (23:536c) - callab NamingScreen_AnimateCursor + callfar NamingScreen_AnimateCursor ret .MailCursor ; 8d373 (23:5373) - callab ComposeMail_AnimateCursor + callfar ComposeMail_AnimateCursor ret .GameFreakLogo: ; 8d37a (23:537a) - callab GameFreakLogoJumper + callfar GameFreakLogoJumper ret .GSIntroStar ; 8d381 (23:5381) @@ -357,11 +357,11 @@ DoAnimFrame: ; 8d24b ret .SlotsGolem: ; 8d422 (23:5422) - callab SlotMachine_AnimateGolem + callfar SlotMachine_AnimateGolem ret .SlotsChansey: ; 8d429 (23:5429) - callab Slots_AnimateChansey + callfar Slots_AnimateChansey ld hl, wcf64 ld a, [hl] cp $2 @@ -405,15 +405,15 @@ DoAnimFrame: ; 8d24b ret .ForUnusedCursor ; 8d46e (23:546e) - callab ret_e00ed + callfar ret_e00ed ret .PokegearArrow ; 8d475 (23:5475) - callab AnimatePokegearModeIndicatorArrow + callfar AnimatePokegearModeIndicatorArrow ret .DummyGameCursor ; 8d47c (23:547c) - callab DummyGame_InterpretJoypad_AnimateCursor + callfar DummyGame_InterpretJoypad_AnimateCursor ret .TradePokeBall ; 8d483 (23:5483) @@ -566,7 +566,7 @@ DoAnimFrame: ; 8d24b ret .TrademonInTube ; 8d543 (23:5543) - callab TradeAnim_AnimateTrademonInTube + callfar TradeAnim_AnimateTrademonInTube ret .RevealNewMon: ; 8d54a (23:554a) @@ -607,7 +607,7 @@ DoAnimFrame: ; 8d24b ret .RadioTuningKnob: ; 8d578 (23:5578) - callab AnimateTuningKnob + callfar AnimateTuningKnob ret .CutLeaves ; 8d57f (23:557f) @@ -750,11 +750,11 @@ DoAnimFrame: ; 8d24b ret .sprite_anim_seq_1B ; 8d630 (23:5630) - callba Function108bc7 + farcall Function108bc7 ret .sprite_anim_seq_1C ; 8d637 (23:5637) - callba Function108be0 + farcall Function108be0 ret .IntroSuicune ; 8d63e (23:563e) @@ -847,11 +847,11 @@ DoAnimFrame: ; 8d24b ret .sprite_anim_seq_1A ; 8d6b7 (23:56b7) - callba AnimateEZChatCursor + farcall AnimateEZChatCursor ret .Celebi ; 8d6be (23:56be) - callba UpdateCelebiPosition + farcall UpdateCelebiPosition ret .AnonymousJumptable: ; 8d6c5 (23:56c5) diff --git a/engine/start_battle.asm b/engine/start_battle.asm index 51f46b3f2..d23fe1f15 100644 --- a/engine/start_battle.asm +++ b/engine/start_battle.asm @@ -5,7 +5,7 @@ ShowLinkBattleParticipants: ; 2ee18 and a ret z - callba _ShowLinkBattleParticipants + farcall _ShowLinkBattleParticipants ld c, 150 call DelayFrames call ClearTileMap @@ -34,7 +34,7 @@ FindFirstAliveMonAndStartBattle: ; 2ee2f ld a, [hl] ld [BattleMonLevel], a predef Predef_StartBattle - callba _LoadBattleFontsHPBar + farcall _LoadBattleFontsHPBar ld a, 1 ld [hBGMapMode], a call ClearSprites @@ -70,7 +70,7 @@ PlayBattleMusic: ; 2ee6c and a jr nz, .trainermusic - callba RegionCheck + farcall RegionCheck ld a, e and a jr nz, .kantowild @@ -101,11 +101,11 @@ PlayBattleMusic: ; 2ee6c jr z, .done ld de, MUSIC_KANTO_GYM_LEADER_BATTLE - callba IsKantoGymLeader + farcall IsKantoGymLeader jr c, .done ld de, MUSIC_JOHTO_GYM_LEADER_BATTLE - callba IsJohtoGymLeader + farcall IsJohtoGymLeader jr c, .done ld de, MUSIC_RIVAL_BATTLE @@ -126,7 +126,7 @@ PlayBattleMusic: ; 2ee6c and a jr nz, .johtotrainer - callba RegionCheck + farcall RegionCheck ld a, e and a jr nz, .kantotrainer @@ -186,7 +186,7 @@ ClearBattleRAM: ; 2ef18 xor a call ByteFill - callab ResetEnemyStatLevels + callfar ResetEnemyStatLevels call ClearWindowData diff --git a/engine/start_menu.asm b/engine/start_menu.asm index 871da86be..d8fbad82d 100755 --- a/engine/start_menu.asm +++ b/engine/start_menu.asm @@ -5,7 +5,7 @@ StartMenu:: ; 125cd ld de, SFX_MENU call PlaySFX - callba ReanchorBGMap_NoOAMUpdate + farcall ReanchorBGMap_NoOAMUpdate ld hl, StatusFlags2 bit 2, [hl] ; bug catching contest @@ -23,7 +23,7 @@ StartMenu:: ; 125cd call .DrawBugContestStatusBox call SafeUpdateSprites call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap - callba LoadFonts_NoOAMUpdate + farcall LoadFonts_NoOAMUpdate call .DrawBugContestStatus call UpdateTimePals jr .Select @@ -393,7 +393,7 @@ endr ld hl, StatusFlags2 bit 2, [hl] ; bug catching contest ret z - callba StartMenu_DrawBugContestStatusBox + farcall StartMenu_DrawBugContestStatusBox ret ; 128de @@ -403,7 +403,7 @@ endr jr nz, .contest ret .contest - callba StartMenu_PrintBugContestStatus + farcall StartMenu_PrintBugContestStatus ret ; 128ed @@ -442,7 +442,7 @@ StartMenu_Save: ; 1290b ; Save the game. call BufferScreen - callba SaveMenu + farcall SaveMenu jr nc, .asm_12919 ld a, 0 ret @@ -456,7 +456,7 @@ StartMenu_Option: ; 1291c ; Game options. call FadeToMenu - callba OptionsMenu + farcall OptionsMenu ld a, 6 ret ; 12928 @@ -466,7 +466,7 @@ StartMenu_Status: ; 12928 ; Player status. call FadeToMenu - callba TrainerCard + farcall TrainerCard call CloseSubmenu ld a, 0 ret @@ -480,7 +480,7 @@ StartMenu_Pokedex: ; 12937 jr z, .asm_12949 call FadeToMenu - callba Pokedex + farcall Pokedex call CloseSubmenu .asm_12949 @@ -492,7 +492,7 @@ StartMenu_Pokedex: ; 12937 StartMenu_Pokegear: ; 1294c call FadeToMenu - callba PokeGear + farcall PokeGear call CloseSubmenu ld a, 0 ret @@ -502,7 +502,7 @@ StartMenu_Pokegear: ; 1294c StartMenu_Pack: ; 1295b call FadeToMenu - callba Pack + farcall Pack ld a, [wcf66] and a jr nz, .used_item @@ -531,17 +531,17 @@ StartMenu_Pokemon: ; 12976 call ClearBGPalettes .menu - callba LoadPartyMenuGFX - callba InitPartyMenuWithCancel - callba InitPartyMenuGFX + farcall LoadPartyMenuGFX + farcall InitPartyMenuWithCancel + farcall InitPartyMenuGFX .menunoreload - callba WritePartyMenuTilemap - callba PrintPartyMenuText + farcall WritePartyMenuTilemap + farcall PrintPartyMenuText call WaitBGMap call SetPalettes ; load regular palettes? call DelayFrame - callba PartyMenuSelect + farcall PartyMenuSelect jr c, .return ; if cancelled or pressed B call PokemonActionSubmenu @@ -594,13 +594,13 @@ HasNoItems: ; 129d5 TossItemFromPC: ; 129f4 push de call PartyMonItemName - callba _CheckTossableItem + farcall _CheckTossableItem ld a, [wItemAttributeParamBuffer] and a jr nz, .key_item ld hl, .TossHowMany call MenuTextBox - callba SelectQuantityToToss + farcall SelectQuantityToToss push af call CloseWindow call ExitMenu @@ -678,8 +678,8 @@ PartyMonItemName: ; 12a6c CancelPokemonAction: ; 12a79 - callba InitPartyMenuWithCancel - callba UnfreezeMonIcons + farcall InitPartyMenuWithCancel + farcall UnfreezeMonIcons ld a, 1 ret ; 12a88 @@ -689,7 +689,7 @@ PokemonActionSubmenu: ; 12a88 hlcoord 1, 15 lb bc, 2, 18 call ClearBox - callba MonSubmenu + farcall MonSubmenu call GetCurNick ld a, [MenuSelection] ld hl, .Actions @@ -742,13 +742,13 @@ SwitchPartyMons: ; 12aec inc a ld [wSwitchMon], a - callba HoldSwitchmonIcon - callba InitPartyMenuNoCancel + farcall HoldSwitchmonIcon + farcall InitPartyMenuNoCancel ld a, PARTYMENUACTION_MOVE ld [PartyMenuActionText], a - callba WritePartyMenuTilemap - callba PrintPartyMenuText + farcall WritePartyMenuTilemap + farcall PrintPartyMenuText hlcoord 0, 1 ld bc, 20 * 2 @@ -760,18 +760,18 @@ SwitchPartyMons: ; 12aec call SetPalettes call DelayFrame - callba PartyMenuSelect + farcall PartyMenuSelect bit 1, b jr c, .DontSwitch - callba _SwitchPartyMons + farcall _SwitchPartyMons xor a ld [PartyMenuActionText], a - callba LoadPartyMenuGFX - callba InitPartyMenuWithCancel - callba InitPartyMenuGFX + farcall LoadPartyMenuGFX + farcall InitPartyMenuWithCancel + farcall InitPartyMenuGFX ld a, 1 ret @@ -828,10 +828,10 @@ GiveTakePartyMonItem: ; 12b60 .GiveItem: - callba DepositSellInitPackBuffers + farcall DepositSellInitPackBuffers .loop - callba DepositSellPack + farcall DepositSellPack ld a, [wcf66] and a @@ -870,7 +870,7 @@ TryGiveItemToPartymon: ; 12bd9 push hl ld d, a - callba ItemIsMail + farcall ItemIsMail pop hl jr c, .please_remove_mail ld a, [hl] @@ -930,7 +930,7 @@ GivePartyItem: ; 12c4c ld a, [CurItem] ld [hl], a ld d, a - callba ItemIsMail + farcall ItemIsMail jr nc, .done call ComposeMailMessage @@ -951,7 +951,7 @@ TakePartyItem: ; 12c60 call ReceiveItemFromPokemon jr nc, .asm_12c94 - callba ItemIsMail + farcall ItemIsMail call GetPartyItemLocation ld a, [hl] ld [wd265], a @@ -1063,7 +1063,7 @@ StartMenuYesNo: ; 12cf5 ComposeMailMessage: ; 12cfe (4:6cfe) ld de, wTempMailMessage - callba _ComposeMailMessage + farcall _ComposeMailMessage ld hl, PlayerName ld de, wTempMailAuthor ld bc, NAME_LENGTH - 1 @@ -1116,7 +1116,7 @@ MonMailAction: ; 12d45 jp .done .read - callba ReadPartyMonMail + farcall ReadPartyMonMail ld a, $0 ret @@ -1126,7 +1126,7 @@ MonMailAction: ; 12d45 jr c, .RemoveMailToBag ld a, [CurPartyMon] ld b, a - callba SendMailToPC + farcall SendMailToPC jr c, .MailboxFull ld hl, .sentmailtopctext call MenuTextBoxBackup @@ -1234,7 +1234,7 @@ OpenPartyStats: ; 12e00 MonMenu_Cut: ; 12e1b - callba CutFunction + farcall CutFunction ld a, [wFieldMoveSucceeded] cp $1 jr nz, .Fail @@ -1249,13 +1249,13 @@ MonMenu_Cut: ; 12e1b MonMenu_Fly: ; 12e30 - callba FlyFunction + farcall FlyFunction ld a, [wFieldMoveSucceeded] cp $2 jr z, .Fail cp $0 jr z, .Error - callba TrainerRankings_Fly + farcall TrainerRankings_Fly ld b, $4 ld a, $2 ret @@ -1274,7 +1274,7 @@ MonMenu_Fly: ; 12e30 ; 12e55 MonMenu_Flash: ; 12e55 - callba OWFlash + farcall OWFlash ld a, [wFieldMoveSucceeded] cp $1 jr nz, .Fail @@ -1288,7 +1288,7 @@ MonMenu_Flash: ; 12e55 ; 12e6a MonMenu_Strength: ; 12e6a - callba StrengthFunction + farcall StrengthFunction ld a, [wFieldMoveSucceeded] cp $1 jr nz, .Fail @@ -1302,7 +1302,7 @@ MonMenu_Strength: ; 12e6a ; 12e7f MonMenu_Whirlpool: ; 12e7f - callba WhirlpoolFunction + farcall WhirlpoolFunction ld a, [wFieldMoveSucceeded] cp $1 jr nz, .Fail @@ -1316,7 +1316,7 @@ MonMenu_Whirlpool: ; 12e7f ; 12e94 MonMenu_Waterfall: ; 12e94 - callba WaterfallFunction + farcall WaterfallFunction ld a, [wFieldMoveSucceeded] cp $1 jr nz, .Fail @@ -1330,7 +1330,7 @@ MonMenu_Waterfall: ; 12e94 ; 12ea9 MonMenu_Teleport: ; 12ea9 - callba TeleportFunction + farcall TeleportFunction ld a, [wFieldMoveSucceeded] and a jr z, .Fail @@ -1344,7 +1344,7 @@ MonMenu_Teleport: ; 12ea9 ; 12ebd MonMenu_Surf: ; 12ebd - callba SurfFunction + farcall SurfFunction ld a, [wFieldMoveSucceeded] and a jr z, .Fail @@ -1358,7 +1358,7 @@ MonMenu_Surf: ; 12ebd ; 12ed1 MonMenu_Dig: ; 12ed1 - callba DigFunction + farcall DigFunction ld a, [wFieldMoveSucceeded] cp $1 jr nz, .Fail @@ -1374,7 +1374,7 @@ MonMenu_Dig: ; 12ed1 MonMenu_Softboiled_MilkDrink: ; 12ee6 call .CheckMonHasEnoughHP jr nc, .NotEnoughHP - callba Softboiled_MilkDrinkFunction + farcall Softboiled_MilkDrinkFunction jr .finish .NotEnoughHP: @@ -1417,7 +1417,7 @@ MonMenu_Softboiled_MilkDrink: ; 12ee6 ; 12f26 MonMenu_Headbutt: ; 12f26 - callba HeadbuttFunction + farcall HeadbuttFunction ld a, [wFieldMoveSucceeded] cp $1 jr nz, .Fail @@ -1431,7 +1431,7 @@ MonMenu_Headbutt: ; 12f26 ; 12f3b MonMenu_RockSmash: ; 12f3b - callba RockSmashFunction + farcall RockSmashFunction ld a, [wFieldMoveSucceeded] cp $1 jr nz, .Fail @@ -1445,7 +1445,7 @@ MonMenu_RockSmash: ; 12f3b ; 12f50 MonMenu_SweetScent: ; 12f50 - callba SweetScentFromMenu + farcall SweetScentFromMenu ld b, $4 ld a, $2 ret @@ -1762,8 +1762,8 @@ SetUpMoveScreenBG: ; 13172 call ClearSprites xor a ld [hBGMapMode], a - callba LoadStatsScreenPageTilesGFX - callba ClearSpriteAnims2 + farcall LoadStatsScreenPageTilesGFX + farcall ClearSpriteAnims2 ld a, [CurPartyMon] ld e, a ld d, $0 @@ -1772,7 +1772,7 @@ SetUpMoveScreenBG: ; 13172 ld a, [hl] ld [wd265], a ld e, $2 - callba LoadMenuMonIcon + farcall LoadMenuMonIcon hlcoord 0, 1 ld b, 9 ld c, 18 @@ -1792,7 +1792,7 @@ SetUpMoveScreenBG: ; 13172 hlcoord 5, 1 call PlaceString push bc - callba CopyPkmnToTempMon + farcall CopyPkmnToTempMon pop hl call PrintLevel ld hl, PlayerHPPal diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index 14a0c1d47..842e5ea2c 100755 --- a/engine/stats_screen.asm +++ b/engine/stats_screen.asm @@ -33,7 +33,7 @@ StatsScreenInit_gotaddress: ; 4dc94 call ClearBGPalettes call ClearTileMap call UpdateSprites - callba StatsScreen_LoadFont + farcall StatsScreen_LoadFont pop hl call _hl_ call ClearBGPalettes @@ -83,13 +83,13 @@ StatsScreenMobile: ; 4dcf7 or $1 ld [wcf64], a .loop - callba Mobile_SetOverworldDelay + farcall Mobile_SetOverworldDelay ld a, [wJumptableIndex] and $7f ld hl, StatsScreenPointerTable rst JumpTable call StatsScreen_WaitAnim - callba MobileComms_CheckInactivityTimer + farcall MobileComms_CheckInactivityTimer jr c, .exit ld a, [wJumptableIndex] bit 7, a @@ -121,14 +121,14 @@ StatsScreen_WaitAnim: ; 4dd3a (13:5d3a) ret .try_anim - callba SetUpPokeAnim + farcall SetUpPokeAnim jr nc, .finish ld hl, wcf64 res 6, [hl] .finish ld hl, wcf64 res 5, [hl] - callba HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTileMapToWRAMBank3 ret StatsScreen_SetJumptableIndex: ; 4dd62 (13:5d62) @@ -148,7 +148,7 @@ MonStatsInit: ; 4dd72 (13:5d72) res 6, [hl] call ClearBGPalettes call ClearTileMap - callba HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTileMapToWRAMBank3 call StatsScreen_CopyToTempMon ld a, [CurPartySpecies] cp EGG @@ -234,14 +234,14 @@ StatsScreen_CopyToTempMon: ; 4ddf2 (13:5df2) jr .done .breedmon - callba CopyPkmnToTempMon + farcall CopyPkmnToTempMon ld a, [CurPartySpecies] cp EGG jr z, .done ld a, [MonType] cp BOXMON jr c, .done - callba CalcTempmonStats + farcall CalcTempmonStats .done and a ret @@ -254,7 +254,7 @@ StatsScreen_GetJoypad: ; 4de2c (13:5e2c) push hl push de push bc - callba StatsScreenDPad + farcall StatsScreenDPad pop bc pop de pop hl @@ -419,7 +419,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea) ld a, [hli] ld d, a ld e, [hl] - callba ComputeHPBarPixels + farcall ComputeHPBarPixels ld hl, wCurHPPal call SetHPPal ld b, SCGB_STATS_SCREEN_HP_PALS @@ -429,7 +429,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea) .PlaceGenderChar: ; 4df66 (13:5f66) push hl - callba GetGender + farcall GetGender pop hl ret c ld a, "♂" @@ -480,7 +480,7 @@ StatsScreen_PlacePageSwitchArrows: ; 4df9b (13:5f9b) StatsScreen_PlaceShinyIcon: ; 4dfa6 (13:5fa6) ld bc, TempMonDVs - callba CheckShininess + farcall CheckShininess ret nc hlcoord 19, 0 ld [hl], "" @@ -519,7 +519,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6) ld a, [wcf64] and $3 ld c, a - callba LoadStatsScreenPals + farcall LoadStatsScreenPals call DelayFrame ld hl, wcf64 set 5, [hl] @@ -639,7 +639,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6) jr z, .AlreadyAtMaxLevel inc a ld d, a - callba CalcExpAtLevel + farcall CalcExpAtLevel ld hl, TempMonExp + 2 ld hl, TempMonExp + 2 ld a, [hQuotient + 2] @@ -719,7 +719,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6) and a ret z ld b, a - callba TimeCapsule_ReplaceTeruSama + farcall TimeCapsule_ReplaceTeruSama ld a, b ld [wd265], a call GetItemName @@ -768,7 +768,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6) ld hl, .OTNamePointers call GetNicknamePointer call CopyNickname - callba CheckNickErrors + farcall CheckNickErrors hlcoord 2, 13 call PlaceString ld a, [TempMonCaughtGender] @@ -1013,7 +1013,7 @@ EggStatsScreen: ; 4e33a call DelayFrame hlcoord 0, 0 call PrepMonFrontpic - callba HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTileMapToWRAMBank3 call StatsScreen_AnimateEgg ld a, [TempMonHappiness] diff --git a/engine/tempmon.asm b/engine/tempmon.asm index 332cb0c6c..be989d14b 100644 --- a/engine/tempmon.asm +++ b/engine/tempmon.asm @@ -19,7 +19,7 @@ CopyPkmnToTempMon: ; 5084a cp OTPARTYMON jr z, .copywholestruct ld bc, BOXMON_STRUCT_LENGTH - callab CopyBoxmonToTempMon + callfar CopyBoxmonToTempMon jr .done .copywholestruct diff --git a/engine/time.asm b/engine/time.asm index 296cc335d..61ef614c3 100755 --- a/engine/time.asm +++ b/engine/time.asm @@ -200,7 +200,7 @@ CheckPokerusTick:: ; 114e7 and a jr z, .done ; not even a day has passed since game start ld b, a - callba ApplyPokerusTick + farcall ApplyPokerusTick .done xor a ret @@ -282,7 +282,7 @@ DoMysteryGiftIfDayHasPassed: ; 11548 ld hl, Buffer1 call InitOneDayCountdown call CloseSRAM - callba Function1050c8 + farcall Function1050c8 .not_timed_out ld a, BANK(sMysteryGiftTimer) diff --git a/engine/timeset.asm b/engine/timeset.asm index 09c5b3a75..417517005 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -590,7 +590,7 @@ Special_InitialSetDSTFlag: ; 90a54 ld a, [hMinutes] ld c, a decoord 1, 14 - callba PrintHoursMins + farcall PrintHoursMins ld hl, .DSTIsThatOK ret ; 90a83 (24:4a83) @@ -621,7 +621,7 @@ Special_InitialClearDSTFlag: ; 90a88 ld a, [hMinutes] ld c, a decoord 1, 14 - callba PrintHoursMins + farcall PrintHoursMins ld hl, .IsThatOK ret ; 90ab7 diff --git a/engine/tmhm2.asm b/engine/tmhm2.asm index 8d19aaf81..c111fa7f9 100755 --- a/engine/tmhm2.asm +++ b/engine/tmhm2.asm @@ -23,7 +23,7 @@ TMHMPocket: ; 2c76f (b:476f) .ConvertItemToTMHMNumber: ; 2c798 (b:4798) ld a, [CurItem] ld c, a - callab GetNumberedTMHM + callfar GetNumberedTMHM ld a, c ld [CurItem], a ret @@ -31,7 +31,7 @@ TMHMPocket: ; 2c76f (b:476f) ConvertCurItemIntoCurTMHM: ; 2c7a7 (b:47a7) ld a, [CurItem] ld c, a - callab GetTMHMNumber + callfar GetTMHMNumber ld a, c ld [wCurTMHM], a ret @@ -77,18 +77,18 @@ ChooseMonToLearnTMHM: ; 2c7fb call CopyBytes call ClearBGPalettes ChooseMonToLearnTMHM_NoRefresh: ; 2c80a - callba LoadPartyMenuGFX - callba InitPartyMenuWithCancel - callba InitPartyMenuGFX + farcall LoadPartyMenuGFX + farcall InitPartyMenuWithCancel + farcall InitPartyMenuGFX ld a, PARTYMENUACTION_TEACH_TMHM ld [PartyMenuActionText], a .loopback - callba WritePartyMenuTilemap - callba PrintPartyMenuText + farcall WritePartyMenuTilemap + farcall PrintPartyMenuText call WaitBGMap call SetPalettes call DelayFrame - callba PartyMenuSelect + farcall PartyMenuSelect push af ld a, [CurPartySpecies] cp EGG @@ -138,7 +138,7 @@ TeachTMHM: ; 2c867 jr .nope .compatible - callab KnowsMove + callfar KnowsMove jr c, .nope predef LearnMove @@ -146,13 +146,13 @@ TeachTMHM: ; 2c867 and a jr z, .nope - callba TrainerRankings_TMsHMsTaught + farcall TrainerRankings_TMsHMsTaught ld a, [CurItem] call IsHM ret c ld c, HAPPINESS_LEARNMOVE - callab ChangeHappiness + callfar ChangeHappiness call ConsumeTM jr .learned_move diff --git a/engine/trade_animation.asm b/engine/trade_animation.asm index 7100bd558..2fc8df854 100755 --- a/engine/trade_animation.asm +++ b/engine/trade_animation.asm @@ -143,7 +143,7 @@ RunTradeAnimScript: ; 28fa1 call ClearTileMap call DisableLCD call LoadFontsBattleExtra - callab ClearSpriteAnims + callfar ClearSpriteAnims ld a, [hCGB] and a jr z, .NotCGB @@ -181,7 +181,7 @@ RunTradeAnimScript: ; 28fa1 ld [hWX], a ld a, $90 ld [hWY], a - callba GetTrademonFrontpic + farcall GetTrademonFrontpic call EnableLCD call LoadTradeBallAndCableGFX ld a, [wPlayerTrademonSpecies] @@ -208,7 +208,7 @@ DoTradeAnimation: ; 29082 bit 7, a jr nz, .finished call .DoTradeAnimCommand - callab PlaySpriteAnimations + callfar PlaySpriteAnimations ld hl, wcf65 inc [hl] call DelayFrame @@ -342,7 +342,7 @@ TradeAnim_InitTubeAnim: ; 2914e push af call DisableLCD - callab ClearSpriteAnims + callfar ClearSpriteAnims hlbgcoord 20, 3 ld bc, 12 ld a, $60 @@ -488,7 +488,7 @@ TradeAnim_TubeToPlayer8: ; 29229 call ClearTileMap call ClearSprites call DisableLCD - callab ClearSpriteAnims + callfar ClearSpriteAnims hlbgcoord 0, 0 ld bc, sScratch - VBGMap0 ld a, " " @@ -862,7 +862,7 @@ TradeAnim_ShowGetmonData: ; 29461 ; 29487 TradeAnim_AnimateFrontpic: ; 29487 - callba AnimateTrademonFrontpic + farcall AnimateTrademonFrontpic call TradeAnim_AdvanceScriptPointer ret @@ -1521,7 +1521,7 @@ LoadTradeBallAndCableGFX: ; 2982b LoadTradeBubbleGFX: ; 2985a call DelayFrame ld e, $3 - callab LoadMenuMonIcon + callfar LoadMenuMonIcon ld de, TradeBubbleGFX ld hl, VTiles0 tile $72 lb bc, BANK(TradeBubbleGFX), $4 diff --git a/engine/trademon_frontpic.asm b/engine/trademon_frontpic.asm index 1641443ea..bf1c2965c 100644 --- a/engine/trademon_frontpic.asm +++ b/engine/trademon_frontpic.asm @@ -17,7 +17,7 @@ AnimateTrademonFrontpic: ; 4d81e ld a, [wOTTrademonSpecies] call IsAPokemon ret c - callba ShowOTTrademonStats + farcall ShowOTTrademonStats ld a, [wOTTrademonSpecies] ld [CurPartySpecies], a ld a, [wOTTrademonDVs] @@ -28,7 +28,7 @@ AnimateTrademonFrontpic: ; 4d81e call GetSGBLayout ld a, %11100100 ; 3,2,1,0 call DmgToCgbBGPals - callba TradeAnim_ShowGetmonFrontpic + farcall TradeAnim_ShowGetmonFrontpic ld a, [wOTTrademonSpecies] ld [CurPartySpecies], a hlcoord 7, 2 diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm index 6ed9f6ea6..01a033650 100755 --- a/engine/trainer_card.asm +++ b/engine/trainer_card.asm @@ -34,7 +34,7 @@ TrainerCard: ; 25105 call ClearTileMap call DisableLCD - callba GetCardPic + farcall GetCardPic ld hl, CardRightCornerGFX ld de, VTiles2 tile $1c diff --git a/engine/unused_correct_party.asm b/engine/unused_correct_party.asm index dd2e1111c..2fa98a545 100644 --- a/engine/unused_correct_party.asm +++ b/engine/unused_correct_party.asm @@ -107,7 +107,7 @@ CorrectErrorsInPlayerParty: ; unreferenced push bc call .GetLengthOfStringWith6CharCap push de - callba CheckStringForErrors + farcall CheckStringForErrors pop hl pop bc jr nc, .valid_nickname @@ -145,7 +145,7 @@ CorrectErrorsInPlayerParty: ; unreferenced push bc call .GetLengthOfStringWith6CharCap push de - callba CheckStringForErrors + farcall CheckStringForErrors pop hl jr nc, .valid_ot_name ld d, h diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm index 365e24ea6..6dec2ec78 100755 --- a/engine/warp_connection.asm +++ b/engine/warp_connection.asm @@ -8,7 +8,7 @@ HandleNewMap: ; 1045b0 ld a, MAPCALLBACK_NEWMAP call RunMapCallback InitCommandQueue: ; 1045c4 - callba ClearCmdQueue + farcall ClearCmdQueue ld a, MAPCALLBACK_CMDQUEUE call RunMapCallback call GetMapHeaderTimeOfDayNybble @@ -225,8 +225,8 @@ LoadMapTimeOfDay: ; 104750 res 6, [hl] ld a, $1 ld [wSpriteUpdatesEnabled], a - callba ReplaceTimeOfDayPals - callba UpdateTimeOfDayPal + farcall ReplaceTimeOfDayPals + farcall UpdateTimeOfDayPal call OverworldTextModeSwitch call .ClearBGMap call .PushAttrMap @@ -239,7 +239,7 @@ LoadMapTimeOfDay: ; 104750 ld [wBGMapAnchor], a ld [hSCY], a ld [hSCX], a - callba ApplyBGMapAnchorToObjects + farcall ApplyBGMapAnchorToObjects ld a, [rVBK] push af @@ -298,9 +298,9 @@ LoadGraphics: ; 1047cf ld [hMapAnims], a xor a ld [hTileAnimFrame], a - callba RefreshSprites + farcall RefreshSprites call LoadFontsExtra - callba LoadOverworldFont + farcall LoadOverworldFont ret LoadMapPalettes: ; 1047eb @@ -310,10 +310,10 @@ LoadMapPalettes: ; 1047eb RefreshMapSprites: ; 1047f0 call ClearSprites - callba ReturnFromMapSetupScript + farcall ReturnFromMapSetupScript call GetMovementPermissions - callba RefreshPlayerSprite - callba CheckReplaceKrisSprite + farcall RefreshPlayerSprite + farcall CheckReplaceKrisSprite ld hl, wPlayerSpriteSetupFlags bit 6, [hl] jr nz, .skip diff --git a/engine/wildmons.asm b/engine/wildmons.asm index 1b6a88f6f..9aed7017a 100755 --- a/engine/wildmons.asm +++ b/engine/wildmons.asm @@ -805,7 +805,7 @@ ValidateTempWildMonSpecies: ; 2a4a0 ; Finds a rare wild Pokemon in the route of the trainer calling, then checks if it's been Seen already. ; The trainer will then tell you about the Pokemon if you haven't seen it. RandomUnseenWildMon: ; 2a4ab - callba GetCallerLocation + farcall GetCallerLocation ld d, b ld e, c ld hl, JohtoGrassWildMons @@ -878,7 +878,7 @@ RandomUnseenWildMon: ; 2a4ab ; 0x2a51f RandomPhoneWildMon: ; 2a51f - callba GetCallerLocation + farcall GetCallerLocation ld d, b ld e, c ld hl, JohtoGrassWildMons @@ -919,7 +919,7 @@ RandomPhoneWildMon: ; 2a51f RandomPhoneMon: ; 2a567 ; Get a random monster owned by the trainer who's calling. - callba GetCallerLocation + farcall GetCallerLocation ld hl, TrainerGroups ld a, d dec a diff --git a/event/buena.asm b/event/buena.asm index 2cb3b5a63..1227593eb 100644 --- a/event/buena.asm +++ b/event/buena.asm @@ -5,14 +5,14 @@ SpecialBuenasPassword: ; 8af6b call CopyMenuDataHeader ld a, [wBuenasPassword] ld c, a - callba GetBuenasPassword + farcall GetBuenasPassword ld a, [wMenuBorderLeftCoord] add c add $2 ld [wMenuBorderRightCoord], a call PushWindow call DoNthMenu ; menu - callba Buena_ExitMenu + farcall Buena_ExitMenu ld b, $0 ld a, [MenuSelection] ld c, a @@ -58,7 +58,7 @@ SpecialBuenasPassword: ; 8af6b ld a, [MenuSelection] add c ld c, a - callba GetBuenasPassword + farcall GetBuenasPassword pop hl call PlaceString ret diff --git a/event/bug_contest/caught_mon.asm b/event/bug_contest/caught_mon.asm index 729033d8b..5d423f466 100644 --- a/event/bug_contest/caught_mon.asm +++ b/event/bug_contest/caught_mon.asm @@ -3,8 +3,8 @@ BugContest_SetCaughtContestMon: ; e6ce and a jr z, .firstcatch ld [wd265], a - callba DisplayAlreadyCaughtText - callba DisplayCaughtContestMonStats + farcall DisplayAlreadyCaughtText + farcall DisplayCaughtContestMonStats lb bc, 14, 7 call PlaceYesNoBox ret c diff --git a/event/bug_contest/contest.asm b/event/bug_contest/contest.asm index 2cb88ad30..ba561abf2 100644 --- a/event/bug_contest/contest.asm +++ b/event/bug_contest/contest.asm @@ -3,7 +3,7 @@ Special_GiveParkBalls: ; 135db ld [wContestMon], a ld a, 20 ld [wParkBallsRemaining], a - callba StartBugContestTimer + farcall StartBugContestTimer ret BugCatchingContestBattleScript:: ; 0x135eb diff --git a/event/bug_contest/judging.asm b/event/bug_contest/judging.asm index a7a9eb022..fea442a65 100755 --- a/event/bug_contest/judging.asm +++ b/event/bug_contest/judging.asm @@ -1,6 +1,6 @@ _BugContestJudging: ; 1369d call ContestScore - callba TrainerRankings_BugContestScore + farcall TrainerRankings_BugContestScore call BugContest_JudgeContestants ld a, [wBugContestThirdPlacePersonID] call LoadContestantName @@ -97,7 +97,7 @@ LoadContestantName: ; 13730 push hl push bc ; Get the Trainer Class name and copy it into wBugContestWinnerName. - callab GetTrainerClassName + callfar GetTrainerClassName ld hl, StringBuffer1 ld de, wBugContestWinnerName ld bc, TRAINER_CLASS_NAME_LENGTH @@ -120,7 +120,7 @@ LoadContestantName: ; 13730 ; Get the name of the trainer with class c and ID b. ld a, [hl] ld b, a - callab GetTrainerName + callfar GetTrainerName ; Append the name to wBugContestWinnerName. ld hl, StringBuffer1 pop de diff --git a/event/catch_tutorial.asm b/event/catch_tutorial.asm index 8340d8c13..b9352ccd6 100644 --- a/event/catch_tutorial.asm +++ b/event/catch_tutorial.asm @@ -41,7 +41,7 @@ CatchTutorial:: ; 4e554 ld hl, .AutoInput ld a, BANK(.AutoInput) call StartAutoInput - callab StartBattle + callfar StartBattle call StopAutoInput pop af diff --git a/event/celebi.asm b/event/celebi.asm index ab0a333f2..b7bf95145 100755 --- a/event/celebi.asm +++ b/event/celebi.asm @@ -31,7 +31,7 @@ Special_CelebiShrineEvent: ; 4989a push de ld a, $90 ld [wCurrSpriteOAMAddr], a - callba DoNextFrameForAllSprites + farcall DoNextFrameForAllSprites call CelebiEvent_CountDown ld c, 2 call DelayFrames @@ -70,7 +70,7 @@ Special_CelebiShrineEvent: ; 4989a ; 49912 LoadCelebiGFX: ; 49912 - callba ClearSpriteAnims + farcall ClearSpriteAnims ld de, SpecialCelebiLeafGFX ld hl, VTiles1 lb bc, BANK(SpecialCelebiLeafGFX), 4 diff --git a/event/daycare.asm b/event/daycare.asm index 128cf674a..6395a40fb 100755 --- a/event/daycare.asm +++ b/event/daycare.asm @@ -30,7 +30,7 @@ Special_DayCareMan: ; 166d6 jr c, .cancel call DayCareAskDepositPokemon jr c, .print_text - callba DepositMonWithDayCareMan + farcall DepositMonWithDayCareMan ld hl, wDayCareMan set 0, [hl] call DayCare_DepositPokemonText @@ -38,12 +38,12 @@ Special_DayCareMan: ; 166d6 ret .AskWithdrawMon: - callba GetBreedMon1LevelGrowth + farcall GetBreedMon1LevelGrowth ld hl, wBreedMon1Nick call GetPriceToRetrieveBreedmon call DayCare_AskWithdrawBreedMon jr c, .print_text - callba RetrievePokemonFromDayCareMan + farcall RetrievePokemonFromDayCareMan call DayCare_TakeMoney_PlayCry ld hl, wDayCareMan res 0, [hl] @@ -69,7 +69,7 @@ Special_DayCareLady: ; 1672a jr c, .cancel call DayCareAskDepositPokemon jr c, .print_text - callba DepositMonWithDayCareLady + farcall DepositMonWithDayCareLady ld hl, wDayCareLady set 0, [hl] call DayCare_DepositPokemonText @@ -77,12 +77,12 @@ Special_DayCareLady: ; 1672a ret .AskWithdrawMon: - callba GetBreedMon2LevelGrowth + farcall GetBreedMon2LevelGrowth ld hl, wBreedMon2Nick call GetPriceToRetrieveBreedmon call DayCare_AskWithdrawBreedMon jr c, .print_text - callba RetrievePokemonFromDayCareLady + farcall RetrievePokemonFromDayCareLady call DayCare_TakeMoney_PlayCry ld hl, wDayCareLady res 0, [hl] @@ -124,19 +124,19 @@ DayCareAskDepositPokemon: ; 16798 ld a, DAYCARETEXT_WHICH_ONE call PrintDayCareText ld b, PARTYMENUACTION_GIVE_MON - callba SelectTradeOrDayCareMon + farcall SelectTradeOrDayCareMon jr c, .Declined ld a, [CurPartySpecies] cp EGG jr z, .Egg - callba CheckCurPartyMonFainted + farcall CheckCurPartyMonFainted jr c, .OutOfUsableMons ld hl, PartyMon1Item ld bc, PARTYMON_STRUCT_LENGTH ld a, [CurPartyMon] call AddNTimes ld d, [hl] - callba ItemIsMail + farcall ItemIsMail jr c, .HoldingMail ld hl, PartyMonNicknames ld a, [CurPartyMon] @@ -209,7 +209,7 @@ DayCare_AskWithdrawBreedMon: ; 16807 .check_money ld de, Money ld bc, StringBuffer2 + 2 - callba CompareMoney + farcall CompareMoney jr c, .not_enough_money ld a, [PartyCount] cp PARTY_LENGTH @@ -236,7 +236,7 @@ DayCare_AskWithdrawBreedMon: ; 16807 DayCare_TakeMoney_PlayCry: ; 16850 ld bc, StringBuffer2 + 2 ld de, Money - callba TakeMoney + farcall TakeMoney ld a, DAYCARETEXT_WITHDRAW call PrintDayCareText ld a, [CurPartySpecies] @@ -596,7 +596,7 @@ DayCare_InitBreeding: ; 16a3b ld a, [wDayCareMan] bit 0, a ret z - callab CheckBreedmonCompatibility + callfar CheckBreedmonCompatibility ld a, [wd265] and a ret z @@ -639,7 +639,7 @@ DayCare_InitBreeding: ; 16a3b cp DITTO ld a, $0 jr z, .LoadWhichBreedmonIsTheMother - callba GetGender + farcall GetGender ld a, $0 jr z, .LoadWhichBreedmonIsTheMother inc a @@ -653,8 +653,8 @@ DayCare_InitBreeding: ; 16a3b .GotMother: ld [CurPartySpecies], a - callab GetPreEvolution - callab GetPreEvolution + callfar GetPreEvolution + callfar GetPreEvolution ld a, EGG_LEVEL ld [CurPartyLevel], a @@ -685,7 +685,7 @@ DayCare_InitBreeding: ; 16a3b xor a ld [Buffer1], a predef FillMoves - callba InitEggMoves + farcall InitEggMoves ld hl, wEggMonID ld a, [PlayerID] ld [hli], a @@ -693,7 +693,7 @@ DayCare_InitBreeding: ; 16a3b ld [hl], a ld a, [CurPartyLevel] ld d, a - callab CalcExpAtLevel + callfar CalcExpAtLevel ld hl, wEggMonExp ld a, [hMultiplicand] ld [hli], a @@ -726,7 +726,7 @@ DayCare_InitBreeding: ; 16a3b ld a, TEMPMON ld [MonType], a push hl - callba GetGender + farcall GetGender pop hl ld de, wBreedMon1DVs ld bc, wBreedMon2DVs diff --git a/event/field_moves.asm b/event/field_moves.asm index 4c4b8cfc1..1c21f4995 100755 --- a/event/field_moves.asm +++ b/event/field_moves.asm @@ -7,20 +7,20 @@ PlayWhirlpoolSound: ; 8c7d4 ; 8c7e1 BlindingFlash: ; 8c7e1 - callba FadeOutPalettes + farcall FadeOutPalettes ld hl, StatusFlags set 2, [hl] ; Flash - callba ReplaceTimeOfDayPals - callba UpdateTimeOfDayPal + farcall ReplaceTimeOfDayPals + farcall UpdateTimeOfDayPal ld b, SCGB_MAPPALS call GetSGBLayout - callba LoadOW_BGPal7 - callba FadeInPalettes + farcall LoadOW_BGPal7 + farcall FadeInPalettes ret ; 8c80a ShakeHeadbuttTree: ; 8c80a - callba ClearSpriteAnims + farcall ClearSpriteAnims ld de, CutGrassGFX ld hl, VTiles1 lb bc, BANK(CutGrassGFX), 4 @@ -37,7 +37,7 @@ ShakeHeadbuttTree: ; 8c80a ld [hl], $84 ld a, 36 * 4 ld [wCurrSpriteOAMAddr], a - callba DoNextFrameForAllSprites + farcall DoNextFrameForAllSprites call HideHeadbuttTree ld a, $20 ld [wcf64], a @@ -52,7 +52,7 @@ ShakeHeadbuttTree: ; 8c80a dec [hl] ld a, 36 * 4 ld [wCurrSpriteOAMAddr], a - callba DoNextFrameForAllSprites + farcall DoNextFrameForAllSprites call DelayFrame jr .loop @@ -61,7 +61,7 @@ ShakeHeadbuttTree: ; 8c80a call WaitBGMap xor a ld [hBGMapMode], a - callba ClearSpriteAnims + farcall ClearSpriteAnims ld hl, Sprites + 36 * 4 ld bc, SpritesEnd - (Sprites + 36 * 4) xor a @@ -129,7 +129,7 @@ OWCutAnimation: ; 8c940 jr nz, .finish ld a, 36 * 4 ld [wCurrSpriteOAMAddr], a - callab DoNextFrameForAllSprites + callfar DoNextFrameForAllSprites call OWCutJumptable call DelayFrame jr .loop @@ -139,7 +139,7 @@ OWCutAnimation: ; 8c940 ; 8c96d .LoadCutGFX: ; 8c96d - callab ClearSpriteAnims ; pointless to farcall + callfar ClearSpriteAnims ; pointless to farcall ld de, CutGrassGFX ld hl, VTiles1 lb bc, BANK(CutGrassGFX), 4 @@ -343,7 +343,7 @@ FlyFromAnim: ; 8caed jr nz, .exit ld a, 0 * 4 ld [wCurrSpriteOAMAddr], a - callab DoNextFrameForAllSprites + callfar DoNextFrameForAllSprites call FlyFunction_FrameTimer call DelayFrame jr .loop @@ -381,7 +381,7 @@ FlyToAnim: ; 8cb33 jr nz, .exit ld a, 0 * 4 ld [wCurrSpriteOAMAddr], a - callab DoNextFrameForAllSprites + callfar DoNextFrameForAllSprites call FlyFunction_FrameTimer call DelayFrame jr .loop @@ -411,7 +411,7 @@ FlyToAnim: ; 8cb33 ret FlyFunction_InitGFX: ; 8cb9b (23:4b9b) - callab ClearSpriteAnims + callfar ClearSpriteAnims ld de, CutGrassGFX ld hl, VTiles1 tile $00 lb bc, BANK(CutGrassGFX), 4 @@ -424,7 +424,7 @@ FlyFunction_InitGFX: ; 8cb9b (23:4b9b) ld a, [hl] ld [wd265], a ld e, $84 - callba FlyFunction_GetMonIcon + farcall FlyFunction_GetMonIcon xor a ld [wJumptableIndex], a ret diff --git a/event/halloffame.asm b/event/halloffame.asm index 4f37200a4..986c49096 100755 --- a/event/halloffame.asm +++ b/event/halloffame.asm @@ -14,7 +14,7 @@ HallOfFame:: ; 0x8640e ld hl, StatusFlags set 6, [hl] ; hall of fame - callba HallOfFame_InitSaveIfNeeded + farcall HallOfFame_InitSaveIfNeeded ld hl, wHallOfFameCount ld a, [hl] @@ -22,16 +22,16 @@ HallOfFame:: ; 0x8640e jr nc, .ok inc [hl] .ok - callba SaveGameData + farcall SaveGameData call GetHallOfFameParty - callba AddHallOfFameEntry + farcall AddHallOfFameEntry xor a ld [wGameLogicPaused], a call AnimateHallOfFame pop af ld b, a - callba Credits + farcall Credits ret ; 0x86455 @@ -42,11 +42,11 @@ RedCredits:: ; 86455 ld [MusicFadeID + 1], a ld a, 10 ld [MusicFade], a - callba FadeOutPalettes + farcall FadeOutPalettes xor a ld [VramState], a ld [hMapAnims], a - callba InitDisplayForRedCredits + farcall InitDisplayForRedCredits ld c, 8 call DelayFrames call DisableSpriteUpdates @@ -54,7 +54,7 @@ RedCredits:: ; 86455 ld [wSpawnAfterChampion], a ld a, [StatusFlags] ld b, a - callba Credits + farcall Credits ret ; 8648e @@ -65,11 +65,11 @@ HallOfFame_FadeOutMusic: ; 8648e ld [MusicFadeID + 1], a ld a, 10 ld [MusicFade], a - callba FadeOutPalettes + farcall FadeOutPalettes xor a ld [VramState], a ld [hMapAnims], a - callba InitDisplayForHallOfFame + farcall InitDisplayForHallOfFame ld c, 100 jp DelayFrames ; 864b4 @@ -232,7 +232,7 @@ GetHallOfFameParty: ; 8653f AnimateHOFMonEntrance: ; 865b5 push hl call ClearBGPalettes - callba ResetDisplayBetweenHallOfFameMons + farcall ResetDisplayBetweenHallOfFameMons pop hl ld a, [hli] ld [TempMonSpecies], a @@ -499,7 +499,7 @@ DisplayHOFMon: ; 86748 call PlaceString ld a, TEMPMON ld [MonType], a - callba GetGender + farcall GetGender ld a, " " jr c, .got_gender ld a, "♂" @@ -541,7 +541,7 @@ HOF_AnimatePlayerPic: ; 86810 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, " " call ByteFill - callba GetPlayerBackpic + farcall GetPlayerBackpic ld a, $31 ld [hGraphicStartTile], a hlcoord 6, 6 @@ -565,7 +565,7 @@ HOF_AnimatePlayerPic: ; 86810 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, " " call ByteFill - callba HOF_LoadTrainerFrontpic + farcall HOF_LoadTrainerFrontpic xor a ld [hGraphicStartTile], a hlcoord 12, 5 @@ -612,7 +612,7 @@ HOF_AnimatePlayerPic: ; 86810 lb bc, PRINTNUM_LEADINGZEROS | 1, 2 call PrintNum call WaitBGMap - callba ProfOaksPCRating + farcall ProfOaksPCRating ret ; 868ed diff --git a/event/happiness_egg.asm b/event/happiness_egg.asm index a00d471bb..0c9b5a4df 100755 --- a/event/happiness_egg.asm +++ b/event/happiness_egg.asm @@ -196,7 +196,7 @@ DayCareStep:: ; 7282 call Random ld [hl], a - callab CheckBreedmonCompatibility + callfar CheckBreedmonCompatibility ld a, [wd265] cp 230 ld b, -1 + 32 percent diff --git a/event/itemfinder.asm b/event/itemfinder.asm index 5356a1f86..71aaa5b69 100755 --- a/event/itemfinder.asm +++ b/event/itemfinder.asm @@ -1,5 +1,5 @@ ItemFinder: ; 12580 - callba CheckForHiddenItems + farcall CheckForHiddenItems jr c, .found_something ld hl, .Script_FoundNothing jr .resume diff --git a/event/kurt.asm b/event/kurt.asm index e1fff12c0..9bc06a613 100644 --- a/event/kurt.asm +++ b/event/kurt.asm @@ -57,7 +57,7 @@ Special_SelectApricornForKurt: ; 88018 ; 88055 Kurt_SelectApricorn: ; 88055 - callba FindApricornsInBag + farcall FindApricornsInBag jr c, .nope ld hl, .MenuDataHeader call CopyMenuDataHeader @@ -106,7 +106,7 @@ Kurt_SelectApricorn: ; 88055 ld a, [MenuSelection] and a ret z - callba PlaceMenuItemName + farcall PlaceMenuItemName ret ; 880ab @@ -117,7 +117,7 @@ Kurt_SelectApricorn: ; 88055 ret z ld a, [wItemQuantityChangeBuffer] ld [MenuSelectionQuantity], a - callba PlaceMenuItemQuantity + farcall PlaceMenuItemQuantity ret ; 880c2 @@ -140,7 +140,7 @@ Kurt_SelectQuantity: ; 880c2 call .PlaceApricornName call PlaceApricornQuantity call ApplyTilemap - callba Kurt_SelectQuantity_InterpretJoypad + farcall Kurt_SelectQuantity_InterpretJoypad jr nc, .loop push bc @@ -171,7 +171,7 @@ Kurt_SelectQuantity: ; 880c2 add hl, de ld d, h ld e, l - callba PlaceMenuItemName + farcall PlaceMenuItemName ret ; 88126 diff --git a/event/lucky_number.asm b/event/lucky_number.asm index 8cec7599d..4488cfcc9 100644 --- a/event/lucky_number.asm +++ b/event/lucky_number.asm @@ -103,7 +103,7 @@ Special_CheckForLuckyNumberWinners: ; 4d87a ld a, [ScriptVar] and a ret z ; found nothing - callba TrainerRankings_LuckyNumberShow + farcall TrainerRankings_LuckyNumberShow ld a, [wFoundMatchingIDInParty] and a push af diff --git a/event/magikarp.asm b/event/magikarp.asm index e18d087dd..4dab89816 100644 --- a/event/magikarp.asm +++ b/event/magikarp.asm @@ -5,7 +5,7 @@ Special_CheckMagikarpLength: ; fbb32 ; Returns 0 if the Pokemon you select is not a Magikarp. ; Let's start by selecting a Magikarp. - callba SelectMonFromParty + farcall SelectMonFromParty jr c, .declined ld a, [CurPartySpecies] cp MAGIKARP @@ -28,7 +28,7 @@ Special_CheckMagikarpLength: ; fbb32 ld c, l call CalcMagikarpLength call PrintMagikarpLength - callba TrainerRankings_MagikarpLength + farcall TrainerRankings_MagikarpLength ld hl, .MeasureItText call PrintText diff --git a/event/magnet_train.asm b/event/magnet_train.asm index c6c6da846..567e0392e 100755 --- a/event/magnet_train.asm +++ b/event/magnet_train.asm @@ -45,7 +45,7 @@ Special_MagnetTrain: ; 8cc04 jr z, .initialize bit 7, a jr nz, .done - callab PlaySpriteAnimations + callfar PlaySpriteAnimations call MagnetTrain_Jumptable call MagnetTrain_UpdateLYOverrides call PushLYOverrides @@ -117,7 +117,7 @@ MagntTrain_LoadGFX_PlayMusic: ; 8ccc9 call ClearBGPalettes call ClearSprites call DisableLCD - callab ClearSpriteAnims + callfar ClearSpriteAnims call SetMagnetTrainPals call DrawMagnetTrain ld a, $90 @@ -131,7 +131,7 @@ MagntTrain_LoadGFX_PlayMusic: ; 8ccc9 push af ld a, $1 ld [rSVBK], a - callba GetPlayerIcon + farcall GetPlayerIcon pop af ld [rSVBK], a ld hl, VTiles0 @@ -423,7 +423,7 @@ MagnetTrain_Jumptable: ; 8cdf7 ; 8ceae MagnetTrain_Jumptable_FirstRunThrough: ; 8ceae - callba PlaySpriteAnimations + farcall PlaySpriteAnimations call MagnetTrain_Jumptable call MagnetTrain_UpdateLYOverrides call PushLYOverrides diff --git a/event/mom.asm b/event/mom.asm index 80513e5fb..a23b55256 100644 --- a/event/mom.asm +++ b/event/mom.asm @@ -161,7 +161,7 @@ Special_BankOfMom: ; 16218 jr z, .CancelDeposit ld de, Money ld bc, StringBuffer2 - callba CompareMoney + farcall CompareMoney jr c, .DontHaveThatMuchToDeposit ld hl, StringBuffer2 ld de, StringBuffer2 + 3 @@ -169,11 +169,11 @@ Special_BankOfMom: ; 16218 call CopyBytes ld bc, wMomsMoney ld de, StringBuffer2 - callba GiveMoney + farcall GiveMoney jr c, .CantDepositThatMuch ld bc, StringBuffer2 + 3 ld de, Money - callba TakeMoney + farcall TakeMoney ld hl, StringBuffer2 ld de, wMomsMoney ld bc, 3 @@ -232,15 +232,15 @@ Special_BankOfMom: ; 16218 call CopyBytes ld de, wMomsMoney ld bc, StringBuffer2 - callba CompareMoney + farcall CompareMoney jr c, .InsufficientFundsInBank ld bc, Money ld de, StringBuffer2 - callba GiveMoney + farcall GiveMoney jr c, .NotEnoughRoomInWallet ld bc, StringBuffer2 + 3 ld de, wMomsMoney - callba TakeMoney + farcall TakeMoney ld hl, StringBuffer2 ld de, Money ld bc, 3 @@ -568,7 +568,7 @@ Mom_WithdrawDepositMenuJoypad: ; 16571 ld c, l ld b, h ld de, StringBuffer2 - callba GiveMoney + farcall GiveMoney ret .decrementdigit @@ -577,7 +577,7 @@ Mom_WithdrawDepositMenuJoypad: ; 16571 ld c, l ld b, h ld de, StringBuffer2 - callba TakeMoney + farcall TakeMoney ret .getdigitquantity diff --git a/event/mom_phone.asm b/event/mom_phone.asm index aab4abe4b..35021dd42 100755 --- a/event/mom_phone.asm +++ b/event/mom_phone.asm @@ -20,7 +20,7 @@ MomTriesToBuySomething:: ; fcfec ret nc ld b, BANK(.Script) ld de, .Script - callba LoadScriptBDE + farcall LoadScriptBDE scf ret ; fd00f @@ -71,7 +71,7 @@ CheckBalance_MomItem2: ; fd044 ld [hMoneyTemp + 2], a ld de, wMomsMoney ld bc, hMoneyTemp - callba CompareMoney + farcall CompareMoney jr nc, .have_enough_money .nope @@ -91,7 +91,7 @@ CheckBalance_MomItem2: ; fd044 .loop ld de, MomItemTriggerBalance ld bc, wMomsMoney - callba CompareMoney + farcall CompareMoney jr z, .exact jr nc, .less_than call .AddMoney @@ -113,7 +113,7 @@ CheckBalance_MomItem2: ; fd044 .AddMoney: ld de, MomItemTriggerBalance ld bc, hMoneyTemp - callba AddMoney + farcall AddMoney ret ; fd0a6 @@ -130,7 +130,7 @@ MomBuysItem_DeductFunds: ; fd0a6 (3f:50a6) ld [hMoneyTemp + 2], a ld de, wMomsMoney ld bc, hMoneyTemp - callba TakeMoney + farcall TakeMoney ret @@ -144,7 +144,7 @@ Mom_GiveItemOrDoll: ; fd0c3 ld a, [hl] ld c, a ld b, 1 - callba DecorationFlagAction_c + farcall DecorationFlagAction_c scf ret diff --git a/event/move_deleter.asm b/event/move_deleter.asm index aa8a1e915..95fc0f1d8 100644 --- a/event/move_deleter.asm +++ b/event/move_deleter.asm @@ -5,7 +5,7 @@ MoveDeletion: jr c, .declined ld hl, .AskWhichMonText call PrintText - callba SelectMonFromParty + farcall SelectMonFromParty jr c, .declined ld a, [CurPartySpecies] cp EGG @@ -20,7 +20,7 @@ MoveDeletion: ld hl, .AskWhichMoveText call PrintText call LoadStandardMenuDataHeader - callba ChooseMoveToDelete + farcall ChooseMoveToDelete push af call ReturnToMapWithSpeechTextbox pop af diff --git a/event/move_tutor.asm b/event/move_tutor.asm index b26114dd0..a15ecaf93 100644 --- a/event/move_tutor.asm +++ b/event/move_tutor.asm @@ -12,12 +12,12 @@ Special_MoveTutor: ; 4925b ld [wPutativeTMHMMove], a call GetMoveName call CopyName1 - callba ChooseMonToLearnTMHM + farcall ChooseMonToLearnTMHM jr c, .cancel jr .enter_loop .loop - callba ChooseMonToLearnTMHM_NoRefresh + farcall ChooseMonToLearnTMHM_NoRefresh jr c, .cancel .enter_loop call CheckCanLearnMoveTutorMove @@ -75,7 +75,7 @@ CheckCanLearnMoveTutorMove: ; 492b9 jr .didnt_learn .can_learn - callab KnowsMove + callfar KnowsMove jr c, .didnt_learn predef LearnMove @@ -84,7 +84,7 @@ CheckCanLearnMoveTutorMove: ; 492b9 jr z, .didnt_learn ld c, HAPPINESS_LEARNMOVE - callab ChangeHappiness + callfar ChangeHappiness jr .learned .didnt_learn diff --git a/event/name_rater.asm b/event/name_rater.asm index 96d0ee363..771c5090a 100644 --- a/event/name_rater.asm +++ b/event/name_rater.asm @@ -7,7 +7,7 @@ NameRater: ; fb6ed ; Select a Pokemon from your party ld hl, NameRaterWhichMonText call PrintText - callba SelectMonFromParty + farcall SelectMonFromParty jr c, .cancel ; He can't rename an egg... ld a, [CurPartySpecies] @@ -34,7 +34,7 @@ NameRater: ; fb6ed call GetBaseData ld b, 0 ld de, StringBuffer2 - callba _NamingScreen + farcall _NamingScreen ; If the new name is empty, treat it as unchanged. call IsNewNameEmpty ld hl, NameRaterSameAsBeforeText diff --git a/event/overworld.asm b/event/overworld.asm index d50c158e9..eff2702b2 100755 --- a/event/overworld.asm +++ b/event/overworld.asm @@ -37,7 +37,7 @@ CheckEngineFlag: ; c721 ; Check engine flag de ; Return carry if flag is not set ld b, CHECK_FLAG - callba EngineFlagAction + farcall EngineFlagAction ld a, c and a jr nz, .isset @@ -177,7 +177,7 @@ CheckMapForSomethingToCut: ; c7ce call GetFacingTileCoord ld c, a push de - callba CheckCutCollision + farcall CheckCutCollision pop de jr nc, .fail ; Get the location of the current block in OverworldMap. @@ -233,7 +233,7 @@ CutDownTreeOrGrass: ; c810 call DelayFrame ld a, [Buffer6] ; Animation type ld e, a - callba OWCutAnimation + farcall OWCutAnimation call BufferScreen call GetMovementPermissions call UpdateSprites @@ -290,10 +290,10 @@ OWFlash: ; c8ac .CheckUseFlash: ; c8b5 ; Flash ld de, ENGINE_ZEPHYRBADGE - callba CheckBadge + farcall CheckBadge jr c, .nozephyrbadge push hl - callba SpecialAerodactylChamber + farcall SpecialAerodactylChamber pop hl jr c, .useflash ld a, [wTimeOfDayPalset] @@ -372,7 +372,7 @@ SurfFunction: ; c909 jr nz, .cannotsurf call CheckDirection jr c, .cannotsurf - callba CheckFacingObject + farcall CheckFacingObject jr c, .cannotsurf ld a, $1 ret @@ -428,7 +428,7 @@ UsedSurfScript: ; c986 end .empty_fn ; c9a2 - callba TrainerRankings_Surf + farcall TrainerRankings_Surf ret UsedSurfText: ; c9a9 @@ -581,7 +581,7 @@ FlyFunction: ; ca3b ld [hMapAnims], a call LoadStandardMenuDataHeader call ClearSprites - callba _FlyMap + farcall _FlyMap ld a, e cp -1 jr z, .illegal @@ -634,10 +634,10 @@ FlyFunction: ; ca3b end .ReturnFromFly: ; cacb - callba Function561d + farcall Function561d call DelayFrame call ReplaceKrisSprite - callba LoadOverworldFont + farcall LoadOverworldFont ret WaterfallFunction: ; cade @@ -649,7 +649,7 @@ WaterfallFunction: ; cade .TryWaterfall: ; cae7 ; Waterfall ld de, ENGINE_RISINGBADGE - callba CheckBadge + farcall CheckBadge ld a, $80 ret c call CheckMapCanWaterfall @@ -701,7 +701,7 @@ Script_UsedWaterfall: ; 0xcb20 ld a, [PlayerStandingTile] call CheckWaterfallTile ret z - callba TrainerRankings_Waterfall + farcall TrainerRankings_Waterfall ld a, $1 ld [ScriptVar], a ret @@ -821,7 +821,7 @@ dig_incave ret .escaperope - callba SpecialKabutoChamber + farcall SpecialKabutoChamber ld hl, .UsedEscapeRopeScript call QueueScript ld a, $81 @@ -915,7 +915,7 @@ TeleportFunction: ; cc61 ld d, a ld a, [wLastSpawnMapNumber] ld e, a - callba IsSpawnPoint + farcall IsSpawnPoint jr nc, .nope ld a, c ld [DefaultSpawnpoint], a @@ -1206,7 +1206,7 @@ DisappearWhirlpool: ; ce1d call OverworldTextModeSwitch ld a, [Buffer6] ld e, a - callba PlayWhirlpoolSound + farcall PlayWhirlpoolSound call BufferScreen call GetMovementPermissions ret @@ -1360,7 +1360,7 @@ TryRockSmashFromMenu: ; cef4 ret GetFacingObject: ; cf0d - callba CheckFacingObject + farcall CheckFacingObject jr nc, .fail ld a, [hObjectStructIndexBuffer] @@ -1495,7 +1495,7 @@ FishFunction: ; cf8e ld d, a ld a, [Buffer2] ld e, a - callba Fish + farcall Fish ld a, d and a jr z, .nonibble diff --git a/event/poisonstep.asm b/event/poisonstep.asm index 1e81e188f..00c7477bc 100755 --- a/event/poisonstep.asm +++ b/event/poisonstep.asm @@ -132,8 +132,8 @@ DoPoisonStep:: ; 505da and %10 jr z, .mon_not_fainted ld c, HAPPINESS_POISONFAINT - callba ChangeHappiness - callba GetPartyNick + farcall ChangeHappiness + farcall GetPartyNick ld hl, .PoisonFaintText call PrintText diff --git a/event/poisonstep_pals.asm b/event/poisonstep_pals.asm index c556ba498..8930d4c5d 100644 --- a/event/poisonstep_pals.asm +++ b/event/poisonstep_pals.asm @@ -20,7 +20,7 @@ LoadPoisonBGPals: ; cbcdd call DmgToCgbBGPals ld c, 4 call DelayFrames - callba _UpdateTimePals + farcall _UpdateTimePals ret .cgb @@ -44,5 +44,5 @@ LoadPoisonBGPals: ; cbcdd ld [hCGBPalUpdate], a ld c, 4 call DelayFrames - callba _UpdateTimePals + farcall _UpdateTimePals ret diff --git a/event/poke_seer.asm b/event/poke_seer.asm index 5e93acc5d..d6e335298 100644 --- a/event/poke_seer.asm +++ b/event/poke_seer.asm @@ -21,7 +21,7 @@ SpecialPokeSeer: ; 4f0bc call JoyWaitAorB ld b, $6 - callba SelectMonFromParty + farcall SelectMonFromParty jr c, .cancel ld a, [CurPartySpecies] @@ -240,7 +240,7 @@ GetCaughtLocation: ; 4f20a cp $7e jr z, .fail ld e, a - callba GetLandmarkName + farcall GetLandmarkName ld hl, StringBuffer1 ld de, wSeerCaughtLocation ld bc, 17 diff --git a/event/print_photo.asm b/event/print_photo.asm index 448910355..06b01bbcf 100755 --- a/event/print_photo.asm +++ b/event/print_photo.asm @@ -1,7 +1,7 @@ PhotoStudio: ; 16dc7 ld hl, .Text_AskWhichMon call PrintText - callba SelectMonFromParty + farcall SelectMonFromParty jr c, .cancel ld a, [CurPartySpecies] cp EGG @@ -10,7 +10,7 @@ PhotoStudio: ; 16dc7 ld hl, .Text_HoldStill call PrintText call DisableSpriteUpdates - callba PrintPartymon + farcall PrintPartymon call ReturnToMapWithSpeechTextbox ld a, [hPrinter] and a diff --git a/event/print_unown.asm b/event/print_unown.asm index 5e0162bad..5d3966585 100644 --- a/event/print_unown.asm +++ b/event/print_unown.asm @@ -81,7 +81,7 @@ UnownPrinter: ; 16be4 .pressed_a ld a, [wJumptableIndex] push af - callba PrintUnownStamp + farcall PrintUnownStamp call RestartMapMusic pop af ld [wJumptableIndex], a @@ -148,7 +148,7 @@ UnownPrinter: ; 16be4 lb bc, 7, 7 predef PlaceGraphic ld de, VTiles2 tile $31 - callba RotateUnownFrontpic + farcall RotateUnownFrontpic ret .Load2bppToSRAM: ; 16cff diff --git a/event/special.asm b/event/special.asm index 71323499e..8937698f5 100755 --- a/event/special.asm +++ b/event/special.asm @@ -15,7 +15,7 @@ SpecialGiveShuckle: ; 7305 ; Caught data. ld b, 0 - callba SetGiftPartyMonCaughtData + farcall SetGiftPartyMonCaughtData ; Holding a Berry. ld bc, PARTYMON_STRUCT_LENGTH @@ -71,7 +71,7 @@ SpecialShuckleNick: db "SHUCKIE@" SpecialReturnShuckle: ; 737e - callba SelectMonFromParty + farcall SelectMonFromParty jr c, .refused ld a, [CurPartySpecies] @@ -107,7 +107,7 @@ SpecialReturnShuckle: ; 737e jr .CheckOT .done - callba CheckCurPartyMonFainted + farcall CheckCurPartyMonFainted jr c, .fainted ld a, [CurPartyMon] ld hl, PartyMon1Happiness @@ -119,7 +119,7 @@ SpecialReturnShuckle: ; 737e jr nc, .HappyToStayWithYou xor a ; take from pc ld [wPokemonWithdrawDepositParameter], a - callab RemoveMonFromPartyOrBox + callfar RemoveMonFromPartyOrBox ld a, $2 .HappyToStayWithYou: ld [ScriptVar], a @@ -141,7 +141,7 @@ SpecialReturnShuckle: ; 737e ret Special_BillsGrandfather: ; 73f7 - callba SelectMonFromParty + farcall SelectMonFromParty jr c, .cancel ld a, [CurPartySpecies] ld [ScriptVar], a @@ -167,7 +167,7 @@ Special_DaisyMassage: ; 741d MassageOrHaircut: ; 7420 push hl - callba SelectMonFromParty + farcall SelectMonFromParty pop hl jr c, .nope ld a, [CurPartySpecies] diff --git a/event/squirtbottle.asm b/event/squirtbottle.asm index 7b47a96f6..1134f1bb0 100755 --- a/event/squirtbottle.asm +++ b/event/squirtbottle.asm @@ -29,7 +29,7 @@ _Squirtbottle: ; 50730 cp MAP_ROUTE_36 jr nz, .nope - callba GetFacingObject + farcall GetFacingObject jr c, .nope ld a, d diff --git a/event/sweet_scent.asm b/event/sweet_scent.asm index 63eec9922..77567488c 100755 --- a/event/sweet_scent.asm +++ b/event/sweet_scent.asm @@ -34,21 +34,21 @@ SweetScentNothing: ; 0x506e9 ; 0x506ef SweetScentEncounter: ; 506ef - callba CanUseSweetScent + farcall CanUseSweetScent jr nc, .no_battle ld hl, StatusFlags2 bit 2, [hl] jr nz, .not_in_bug_contest - callba GetMapEncounterRate + farcall GetMapEncounterRate ld a, b and a jr z, .no_battle - callba ChooseWildEncounter + farcall ChooseWildEncounter jr nz, .no_battle jr .start_battle .not_in_bug_contest - callba ChooseWildEncounter_BugContest + farcall ChooseWildEncounter_BugContest .start_battle ld a, $1 diff --git a/event/whiteout.asm b/event/whiteout.asm index 159f3a519..a9d6f900e 100755 --- a/event/whiteout.asm +++ b/event/whiteout.asm @@ -49,7 +49,7 @@ BattleBGMap: ; 1250a ; 12513 HalveMoney: ; 12513 - callba TrainerRankings_WhiteOuts + farcall TrainerRankings_WhiteOuts ; Halve the player's money. ld hl, Money @@ -71,7 +71,7 @@ GetWhiteoutSpawn: ; 12527 ld d, a ld a, [wLastSpawnMapNumber] ld e, a - callba IsSpawnPoint + farcall IsSpawnPoint ld a, c jr c, .yes xor a ; SPAWN_HOME diff --git a/gfx/mail.asm b/gfx/mail.asm index d4fde366e..c8770468d 100755 --- a/gfx/mail.asm +++ b/gfx/mail.asm @@ -16,7 +16,7 @@ ReadAnyMail: ; b9237 push de ld a, BANK(sPartyMail) call GetSRAMBank - callba IsMailEuropean + farcall IsMailEuropean call CloseSRAM ld a, c ld de, StandardEnglishFont @@ -37,7 +37,7 @@ ReadAnyMail: ; b9237 call WaitBGMap ld a, [Buffer3] ld e, a - callba LoadMailPalettes + farcall LoadMailPalettes call SetPalettes xor a ld [hJoyPressed], a @@ -59,7 +59,7 @@ ReadAnyMail: ; b9237 .pressed_start ld a, [wJumptableIndex] push af - callab PrintMail ; printer + callfar PrintMail ; printer pop af ld [wJumptableIndex], a jr .loop diff --git a/gfx/pics/animation.asm b/gfx/pics/animation.asm index 2f348fbfb..eeaaa49ad 100644 --- a/gfx/pics/animation.asm +++ b/gfx/pics/animation.asm @@ -93,7 +93,7 @@ AnimateFrontpic: ; d008e .loop call SetUpPokeAnim push af - callba HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTileMapToWRAMBank3 pop af jr nc, .loop ret @@ -282,9 +282,9 @@ PokeAnim_DeinitFrames: ; d01a9 ld a, $2 ld [rSVBK], a call PokeAnim_PlaceGraphic - callba HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTileMapToWRAMBank3 call PokeAnim_SetVBank0 - callba HDMATransferAttrMapToWRAMBank3 + farcall HDMATransferAttrMapToWRAMBank3 pop af ld [rSVBK], a ret @@ -881,7 +881,7 @@ PokeAnim_SetVBank1: ; d0504 xor a ld [hBGMapMode], a call .SetFlag - callba HDMATransferAttrMapToWRAMBank3 + farcall HDMATransferAttrMapToWRAMBank3 pop af ld [rSVBK], a ret diff --git a/home.asm b/home.asm index dc03faa2c..71cb0c190 100644 --- a/home.asm +++ b/home.asm @@ -553,7 +553,7 @@ LoadEDTile:: ; 323d ; 323f ; XXX - callba HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrMapAndTileMapToWRAMBank3 ret ; 3246 @@ -869,7 +869,7 @@ HandleStoneQueue:: ; 3567 call .IsObjectInStoneTable jr nc, .nope call CallMapScript - callba EnableScriptMode + farcall EnableScriptMode scf ret @@ -1213,7 +1213,7 @@ GetNick:: ; 38a2 call CopyBytes pop de - callab CheckNickErrors + callfar CheckNickErrors pop bc pop hl diff --git a/home/battle.asm b/home/battle.asm index 3c2e4de43..30096fd4a 100644 --- a/home/battle.asm +++ b/home/battle.asm @@ -130,8 +130,8 @@ RefreshBattleHuds:: ; 39c9 ; 39d4 UpdateBattleHuds:: ; 39d4 - callba UpdatePlayerHUD - callba UpdateEnemyHUD + farcall UpdatePlayerHUD + farcall UpdateEnemyHUD ret ; 39e1 diff --git a/home/copy.asm b/home/copy.asm index 8a307b3df..8ee1c90f9 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -101,32 +101,32 @@ OldDMATransfer:: ; dfd ReplaceKrisSprite:: ; e4a - callba _ReplaceKrisSprite + farcall _ReplaceKrisSprite ret ; e51 LoadStandardFont:: ; e51 - callba _LoadStandardFont + farcall _LoadStandardFont ret ; e58 LoadFontsBattleExtra:: ; e58 - callba _LoadFontsBattleExtra + farcall _LoadFontsBattleExtra ret ; e5f LoadFontsExtra:: ; e5f - callba _LoadFontsExtra1 - callba _LoadFontsExtra2 + farcall _LoadFontsExtra1 + farcall _LoadFontsExtra2 ret ; e6c LoadFontsExtra2:: ; e6c - callba _LoadFontsExtra2 + farcall _LoadFontsExtra2 ret ; e73 diff --git a/home/flag.asm b/home/flag.asm index d2b70731a..ddd3eb235 100644 --- a/home/flag.asm +++ b/home/flag.asm @@ -105,7 +105,7 @@ FlagAction:: ; 0x2e76 CheckReceivedDex:: ; 2ead ld de, ENGINE_POKEDEX ld b, CHECK_FLAG - callba EngineFlagAction + farcall EngineFlagAction ld a, c and a ret diff --git a/home/init.asm b/home/init.asm index 087a26f12..630cfe622 100644 --- a/home/init.asm +++ b/home/init.asm @@ -139,14 +139,14 @@ Init:: ; 17d ld a, -1 ld [hLinkPlayerNumber], a - callba InitCGBPals + farcall InitCGBPals ld a, VBGMap1 / $100 ld [hBGMapAddress + 1], a xor a ; VBGMap1 % $100 ld [hBGMapAddress], a - callba StartClock + farcall StartClock xor a ld [MBC3LatchClock], a diff --git a/home/item.asm b/home/item.asm index 92d74c350..2f550a200 100644 --- a/home/item.asm +++ b/home/item.asm @@ -1,5 +1,5 @@ DoItemEffect:: ; 2f3f - callba _DoItemEffect + farcall _DoItemEffect ret ; 2f46 @@ -7,7 +7,7 @@ CheckTossableItem:: ; 2f46 push hl push de push bc - callba _CheckTossableItem + farcall _CheckTossableItem pop bc pop de pop hl diff --git a/home/joypad.asm b/home/joypad.asm index 0f5060c63..3d5f0aed5 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -414,7 +414,7 @@ ButtonSound:: ; aaf ld a, [InputType] or a jr z, .input_wait_loop - callba _DudeAutoInput_A + farcall _DudeAutoInput_A .input_wait_loop call .blink_cursor diff --git a/home/map.asm b/home/map.asm index 8b6d8f1e4..11f3fdf83 100644 --- a/home/map.asm +++ b/home/map.asm @@ -215,7 +215,7 @@ endr ReturnToMapFromSubmenu:: ; 222a ld a, MAPSETUP_SUBMENU ld [hMapEntryMethod], a - callba RunMapSetupScript + farcall RunMapSetupScript xor a ld [hMapEntryMethod], a ret @@ -226,7 +226,7 @@ CheckWarpTile:: ; 2238 ret nc push bc - callba CheckDirectionalWarp + farcall CheckDirectionalWarp pop bc ret nc @@ -243,7 +243,7 @@ WarpCheck:: ; 224a ; 2252 GetDestinationWarpNumber:: ; 2252 - callba CheckWarpCollision + farcall CheckWarpCollision ret nc ld a, [hROMBank] @@ -717,7 +717,7 @@ RestoreFacingAfterWarp:: ; 248a call .backup .skip - callba GetCoordOfUpperLeftCorner + farcall GetCoordOfUpperLeftCorner ret ; 24ba @@ -1050,15 +1050,15 @@ RunMapCallback:: ; 263b ExecuteCallbackScript:: ; 2674 ; Do map callback de and return to script bank b. - callba CallCallback + farcall CallCallback ld a, [ScriptMode] push af ld hl, ScriptFlags ld a, [hl] push af set 1, [hl] - callba EnableScriptMode - callba ScriptEvents + farcall EnableScriptMode + farcall ScriptEvents pop af ld [ScriptFlags], a pop af @@ -1439,7 +1439,7 @@ LoadTileset:: ; 2821 jr .skip_roof .load_roof - callba LoadMapGroupRoof + farcall LoadMapGroupRoof .skip_roof xor a @@ -1983,7 +1983,7 @@ FadeToMenu:: ; 2b29 xor a ld [hBGMapMode], a call LoadStandardMenuDataHeader - callba FadeOutPalettes + farcall FadeOutPalettes call ClearSprites call DisableSpriteUpdates ret @@ -2007,9 +2007,9 @@ ExitAllMenus:: ; 2b4d FinishExitMenu:: ; 2b5c ld b, SCGB_MAPPALS call GetSGBLayout - callba LoadOW_BGPal7 + farcall LoadOW_BGPal7 call WaitBGMap2 - callba FadeInPalettes + farcall FadeInPalettes call EnableSpriteUpdates ret ; 2b74 @@ -2030,7 +2030,7 @@ ReturnToMapWithSpeechTextbox:: ; 0x2b74 call WaitBGMap2 ld b, SCGB_MAPPALS call GetSGBLayout - callba LoadOW_BGPal7 + farcall LoadOW_BGPal7 call UpdateTimePals call DelayFrame ld a, $1 @@ -2042,7 +2042,7 @@ ReturnToMapWithSpeechTextbox:: ; 0x2b74 ReloadTilesetAndPalettes:: ; 2bae call DisableLCD call ClearSprites - callba RefreshSprites + farcall RefreshSprites call LoadStandardFont call LoadFontsExtra ld a, [hROMBank] @@ -2052,7 +2052,7 @@ ReloadTilesetAndPalettes:: ; 2bae ld a, [MapNumber] ld c, a call SwitchToAnyMapBank - callba UpdateTimeOfDayPal + farcall UpdateTimeOfDayPal call OverworldTextModeSwitch call LoadTileset ld a, 9 @@ -2296,7 +2296,7 @@ GetMapHeaderMusic:: ; 2cbd jr z, .mahoganymart bit RADIO_TOWER_MUSIC_F, c jr nz, .radiotower - callba Function8b342 + farcall Function8b342 ld e, c ld d, 0 .done diff --git a/home/map_objects.asm b/home/map_objects.asm index 2285c8c76..4e88a050a 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -6,7 +6,7 @@ GetSpritePalette:: ; 17ff push bc ld c, a - callba _GetSpritePalette + farcall _GetSpritePalette ld a, c pop bc @@ -328,7 +328,7 @@ _CopyObjectStruct:: ; 1956 call UnmaskObject ld a, [hMapObjectIndexBuffer] call GetMapObject - callba CopyObjectStruct + farcall CopyObjectStruct ret ; 1967 @@ -345,7 +345,7 @@ ApplyDeletionToMapObject:: ; 1967 call .CheckStopFollow pop af call GetObjectStruct - callba DeleteMapObject + farcall DeleteMapObject ret .CheckStopFollow: @@ -356,7 +356,7 @@ ApplyDeletionToMapObject:: ; 1967 cp [hl] ret nz .ok - callba StopFollow + farcall StopFollow ld a, -1 ld [wObjectFollow_Leader], a ld [wObjectFollow_Follower], a @@ -409,7 +409,7 @@ CopyPlayerObjectTemplate:: ; 19a6 .ok ld a, b call GetObjectStruct - callba DeleteMapObject + farcall DeleteMapObject ret ; 19e9 @@ -620,8 +620,8 @@ UpdateSprites:: ; 1ad2 bit 0, a ret z - callba Function55e0 - callba _UpdateSprites + farcall Function55e0 + farcall _UpdateSprites ret ; 1ae5 diff --git a/home/math.asm b/home/math.asm index 01aea6b72..6a779e378 100644 --- a/home/math.asm +++ b/home/math.asm @@ -45,7 +45,7 @@ Multiply:: ; 3119 push hl push bc - callab _Multiply + callfar _Multiply pop bc pop hl diff --git a/home/menu.asm b/home/menu.asm index 53e4457e3..ba1b568c1 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -569,7 +569,7 @@ Place2DMenuItemName:: ; 201c _2DMenu:: ; 202a ld a, [hROMBank] ld [wMenuData2_2DMenuItemStringsBank], a - callba _2DMenu_ + farcall _2DMenu_ ld a, [wMenuCursorBuffer] ret ; 2039 @@ -577,7 +577,7 @@ _2DMenu:: ; 202a InterpretBattleMenu:: ; 2039 ld a, [hROMBank] ld [wMenuData2_2DMenuItemStringsBank], a - callba _InterpretBattleMenu + farcall _InterpretBattleMenu ld a, [wMenuCursorBuffer] ret ; 2048 @@ -585,7 +585,7 @@ InterpretBattleMenu:: ; 2039 InterpretMobileMenu:: ; 2048 ld a, [hROMBank] ld [wMenuData2_2DMenuItemStringsBank], a - callba _InterpretMobileMenu + farcall _InterpretMobileMenu ld a, [wMenuCursorBuffer] ret ; 2057 diff --git a/home/movement.asm b/home/movement.asm index 781a368a9..f006916a4 100644 --- a/home/movement.asm +++ b/home/movement.asm @@ -159,13 +159,13 @@ SetMenuAttributes:: ; 1bb1 ; 1bc9 StaticMenuJoypad:: ; 1bc9 - callab _StaticMenuJoypad + callfar _StaticMenuJoypad call GetMenuJoypad ret ; 1bd3 ScrollingMenuJoypad:: ; 1bd3 - callab _ScrollingMenuJoypad + callfar _ScrollingMenuJoypad call GetMenuJoypad ret ; 1bdd diff --git a/home/names.asm b/home/names.asm index bd90f7828..c8f873c3f 100644 --- a/home/names.asm +++ b/home/names.asm @@ -206,7 +206,7 @@ GetTMHMName:: ; 3487 push de ld a, [wd265] ld c, a - callab GetTMHMNumber + callfar GetTMHMNumber pop de ; HM numbers start from 51, not 1 diff --git a/home/rtc.asm b/home/rtc.asm index d343d118d..5b83f1079 100644 --- a/home/rtc.asm +++ b/home/rtc.asm @@ -14,11 +14,11 @@ RTC:: ; 46f ret z TimeOfDayPals:: ; 47e - callab _TimeOfDayPals + callfar _TimeOfDayPals ret ; 485 UpdateTimePals:: ; 485 - callab _UpdateTimePals + callfar _UpdateTimePals ret ; 48c diff --git a/home/serial.asm b/home/serial.asm index e60704f3d..b0151eae2 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -277,7 +277,7 @@ Function83b:: ; 83b Function862:: ; 862 call LoadTileMapToTempTileMap - callab PlaceWaitingText + callfar PlaceWaitingText call WaitLinkTransfer jp Call_LoadTempTileMapToTileMap ; 871 @@ -285,7 +285,7 @@ Function862:: ; 862 Function871:: ; 871 call LoadTileMapToTempTileMap - callab PlaceWaitingText + callfar PlaceWaitingText jp WaitLinkTransfer ; 87d diff --git a/home/text.asm b/home/text.asm index 3401eba50..4b0d0d5df 100644 --- a/home/text.asm +++ b/home/text.asm @@ -315,7 +315,7 @@ endm Char15:: ; 117b ld c, l ld b, h - callba Function17f036 + farcall Function17f036 jp PlaceNextChar ; 1186 @@ -391,7 +391,7 @@ PlaceEnemysName:: ; 121b ld de, String12a2 call PlaceString push bc - callab Battle_GetTrainerName + callfar Battle_GetTrainerName pop hl ld de, StringBuffer1 jr PlaceCommandCharacter diff --git a/home/tilemap.asm b/home/tilemap.asm index 1d7998130..9e15ed85b 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -1,16 +1,16 @@ PushWindow:: ; 1c00 - callab _PushWindow + callfar _PushWindow ret ; 1c07 ExitMenu:: ; 0x1c07 push af - callab _ExitMenu + callfar _ExitMenu pop af ret InitVerticalMenuCursor:: ; 0x1c10 - callab _InitVerticalMenuCursor + callfar _InitVerticalMenuCursor ret CloseWindow:: ; 0x1c17 diff --git a/home/time.asm b/home/time.asm index abdd34fe2..9ed703686 100644 --- a/home/time.asm +++ b/home/time.asm @@ -28,7 +28,7 @@ UpdateTime:: ; 5a7 call GetClock call FixDays call FixTime - callba GetTimeOfDay + farcall GetTimeOfDay ret ; 5b7 @@ -205,7 +205,7 @@ SetDayOfWeek:: ; 663 jr InitTime ; useless InitTime:: ; 677 - callba _InitTime + farcall _InitTime ret ; 67e diff --git a/home/window.asm b/home/window.asm index ff7d766e2..0570bbb01 100644 --- a/home/window.asm +++ b/home/window.asm @@ -43,8 +43,8 @@ CloseText:: ; 2dcf ld a, $90 ld [hWY], a call ReplaceKrisSprite - callba ReturnFromMapSetupScript - callba LoadOverworldFont + farcall ReturnFromMapSetupScript + farcall LoadOverworldFont ret ; 2e08 @@ -71,7 +71,7 @@ _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:: ; 2e20 ld a, $1 ld [hOAMUpdate], a - callba OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall OpenAndCloseMenu_HDMATransferTileMapAndAttrMap pop af ld [hOAMUpdate], a diff --git a/macros/code.asm b/macros/code.asm index 5e247e9a3..93b35bd94 100644 --- a/macros/code.asm +++ b/macros/code.asm @@ -14,7 +14,7 @@ if _NARG >= 5 else lb \1, \2 * 8, \3 * 8 endc -endm + ENDM depixel EQUS "ldpixel de," bcpixel EQUS "ldpixel bc," @@ -33,7 +33,7 @@ jumptable: MACRO ld h, [hl] ld l, a jp hl -endm + ENDM ; Many mobile functions were dummied out in localization. mobile EQUS "ret" @@ -47,9 +47,9 @@ maskbits: macro ; jr nc, .loop x = 1 rept 8 -IF \1 > x +if \1 > x x = (x + 1) * 2 +- 1 -ENDC +endc endr and x -endm + ENDM diff --git a/macros/rst.asm b/macros/rst.asm index fe7e42723..cf4cc5314 100644 --- a/macros/rst.asm +++ b/macros/rst.asm @@ -8,22 +8,22 @@ farcall: MACRO ; bank, address rst FarCall ENDM -callba EQUS "farcall" - -callab: MACRO ; address, bank +callfar: MACRO ; address, bank ld hl, \1 ld a, BANK(\1) rst FarCall ENDM +; legacy support for pre-2018 pokecrystal +callba EQUS "farcall" +callab EQUS "callfar" + homecall: MACRO ld a, [hROMBank] push af ld a, BANK(\1) rst Bankswitch - call \1 - pop af rst Bankswitch -ENDM + ENDM diff --git a/main.asm b/main.asm index bc6e5f902..357b1223c 100644 --- a/main.asm +++ b/main.asm @@ -153,7 +153,7 @@ UpdateItemDescription: ; 0x244c3 cp -1 ret z decoord 1, 14 - callba PrintItemDescription + farcall PrintItemDescription ret INCLUDE "engine/pokepic.asm" @@ -186,7 +186,7 @@ LevelUpHappinessMod: ; 2709e ld c, HAPPINESS_GAINLEVELATHOME .ok - callab ChangeHappiness + callfar ChangeHappiness ret INCLUDE "data/trainers/trainer_dvs.asm" @@ -197,14 +197,14 @@ _ReturnToBattle_UseBall: ; 2715c ld a, [BattleType] cp BATTLETYPE_TUTORIAL jr z, .gettutorialbackpic - callba GetMonBackpic + farcall GetMonBackpic jr .continue .gettutorialbackpic - callba GetTrainerBackpic + farcall GetTrainerBackpic .continue - callba GetMonFrontpic - callba _LoadBattleFontsHPBar + farcall GetMonFrontpic + farcall _LoadBattleFontsHPBar call GetMemSGBLayout call CloseWindow call LoadStandardMenuDataHeader @@ -546,10 +546,10 @@ LinkMonStatsScreen: ; 4d319 call ClearScreen call ClearBGPalettes call MaxVolume - callba LoadTradeScreenBorder - callba Link_WaitBGMap - callba InitTradeSpeciesList - callba SetTradeRoomBGPals + farcall LoadTradeScreenBorder + farcall Link_WaitBGMap + farcall InitTradeSpeciesList + farcall SetTradeRoomBGPals call WaitBGMap2 ret @@ -974,13 +974,13 @@ INCLUDE "text/phone/extra2.asm" SECTION "bank5E", ROMX _UpdateBattleHUDs: - callba DrawPlayerHUD + farcall DrawPlayerHUD ld hl, PlayerHPPal call SetHPPal - callba DrawEnemyHUD + farcall DrawEnemyHUD ld hl, EnemyHPPal call SetHPPal - callba FinishBattleAnim + farcall FinishBattleAnim ret diff --git a/mobile/battle_tower_5c.asm b/mobile/battle_tower_5c.asm index 4ab57ea2c..b5ef96fdd 100755 --- a/mobile/battle_tower_5c.asm +++ b/mobile/battle_tower_5c.asm @@ -1,13 +1,13 @@ BattleTowerRoomMenu: ; 1700b0 ; special call InitBattleTowerChallengeRAM - callba _BattleTowerRoomMenu + farcall _BattleTowerRoomMenu ret ; 1700ba Function1700ba: ; 1700ba call InitBattleTowerChallengeRAM - callba Function11811a + farcall Function11811a ret ; 1700c4 @@ -56,7 +56,7 @@ Function1700c4: ; 1700c4 Function170114: ; 170114 call InitBattleTowerChallengeRAM call .Function170121 - callba Function11805f + farcall Function11805f ret ; 170121 @@ -111,7 +111,7 @@ Function170139: ; 170139 call CopyBytes ld bc, PlayerID ld de, PlayerGender - callba GetMobileOTTrainerClass + farcall GetMobileOTTrainerClass ld de, wBT_OTTempPkmn1CaughtGender ld a, c ld [de], a @@ -243,15 +243,15 @@ RunBattleTowerTrainer: ; 17024d xor a ld [wLinkMode], a - callba TrainerRankings_Healings - callba HealParty + farcall TrainerRankings_Healings + farcall HealParty call ReadBTTrainerParty call Clears5_a89a predef StartBattle - callba LoadPokemonData - callba HealParty + farcall LoadPokemonData + farcall HealParty ld a, [wBattleResult] ld [ScriptVar], a and a @@ -286,7 +286,7 @@ ReadBTTrainerParty: ; 1702b7 ; with their species names. ld de, wBT_OTTempPkmn1Name ; $c643 ld c, PKMN_NAME_LENGTH - callba CheckStringForErrors + farcall CheckStringForErrors jr nc, .skip_mon_1 ld a, [wBT_OTTempPkmn1] @@ -301,7 +301,7 @@ ReadBTTrainerParty: ; 1702b7 .skip_mon_1 ld de, wBT_OTTempPkmn2Name ; $c67e ld c, PKMN_NAME_LENGTH - callba CheckStringForErrors + farcall CheckStringForErrors jr nc, .skip_mon_2 ld a, [wBT_OTTempPkmn2] ; [$c64e] ld [wNamedObjectIndexBuffer], a @@ -315,7 +315,7 @@ ReadBTTrainerParty: ; 1702b7 .skip_mon_2 ld de, wBT_OTTempPkmn3Name ; $c686 + 51 = $c6b9 ld c, PKMN_NAME_LENGTH - callba CheckStringForErrors + farcall CheckStringForErrors jr nc, .skip_mon_3 ld a, [wBT_OTTempPkmn3] ; [$c689] ld [wNamedObjectIndexBuffer], a @@ -337,7 +337,7 @@ ReadBTTrainerParty: ; 1702b7 ; Repair the trainer name if needed, then copy it to OTPlayerName ld de, wBT_OTTempName ld c, NAME_LENGTH - 1 - callba CheckStringForErrors + farcall CheckStringForErrors jr nc, .trainer_name_okay ld hl, BT_ChrisName jr .done_trainer_name @@ -675,7 +675,7 @@ Function1704e1: ; 1704e1 bit 7, a jr nz, .done call .DoJumptable - callba ReloadMapPart + farcall ReloadMapPart jr .loop .done @@ -1049,7 +1049,7 @@ Function170729: ; 170729 (5c:4729) BattleTowerAction $1d ret BattleTower_SaveOptions: ; 170737 (5c:4737) BattleTowerAction $1f - callba SaveOptions + farcall SaveOptions ret BattleTower_RandomlyChooseReward: ; 17073e (5c:473e) BattleTowerAction $1e @@ -1256,7 +1256,7 @@ BattleTower_CheckSaveFileExistsAndIsYours: ; 17089a BattleTowerAction $09 ld a, [wSaveFileExists] and a jr z, .nope - callba CompareLoadedAndSavedPlayerID + farcall CompareLoadedAndSavedPlayerID jr z, .yes xor a jr .nope @@ -1486,8 +1486,8 @@ Jumptable_1709e7: ; 1709e7 ld a, [$a826] ld [wcd31], a call CloseSRAM - callba Function11b6b4 - callba Function17d0f3 + farcall Function11b6b4 + farcall Function17d0f3 ld a, $1 ld [ScriptVar], a ret @@ -1611,7 +1611,7 @@ BattleTowerAction_LevelCheck: ; 170ae8 (5c:4ae8) BattleTowerAction $18 ld [wcd4f], a xor a ld [ScriptVar], a - callba BattleTower_LevelCheck ; level check + farcall BattleTower_LevelCheck ; level check ret nc ld a, $5 call GetSRAMBank @@ -1631,7 +1631,7 @@ BattleTowerAction_UbersCheck: ; 170b16 (5c:4b16) BattleTowerAction $19 ld [wcd4f], a xor a ld [ScriptVar], a - callba BattleTower_UbersCheck + farcall BattleTower_UbersCheck ret nc ld a, $5 call GetSRAMBank @@ -1641,7 +1641,7 @@ BattleTowerAction_UbersCheck: ; 170b16 (5c:4b16) BattleTowerAction $19 ret Function_LoadOpponentTrainerAndPokemonsWithOTSprite: ; 0x170b44 - callba Function_LoadOpponentTrainerAndPokemons + farcall Function_LoadOpponentTrainerAndPokemons ld a, [rSVBK] push af ld a, $3 @@ -1681,7 +1681,7 @@ Function_LoadOpponentTrainerAndPokemonsWithOTSprite: ; 0x170b44 ld [hUsedSpriteIndex], a ld a, [hl] ld [hUsedSpriteTile], a - callba GetUsedSprite + farcall GetUsedSprite ret ; 170b90 @@ -1758,7 +1758,7 @@ ret_170bd2: ; 170bd2 ; 170bd3 SpecialCheckForBattleTowerRules: ; 170bd3 - callba CheckForBattleTowerRules + farcall CheckForBattleTowerRules jr c, .asm_170bde xor a jr .asm_170be0 diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index d98470095..5f6fc1808 100755 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -329,10 +329,10 @@ Function11c1b9: ; 11c1b9 ld de, VTiles0 call Decompress call EnableLCD - callba ReloadMapPart - callba ClearSpriteAnims - callba LoadPokemonData - callba Pokedex_ABCMode + farcall ReloadMapPart + farcall ClearSpriteAnims + farcall LoadPokemonData + farcall Pokedex_ABCMode ld a, [rSVBK] push af ld a, $5 @@ -385,12 +385,12 @@ EZChat_MasterLoop: ; 11c283 bit 7, a jr nz, .exit call .DoJumptableFunction - callba PlaySpriteAnimations - callba ReloadMapPart + farcall PlaySpriteAnimations + farcall ReloadMapPart jr .loop .exit - callba ClearSpriteAnims + farcall ClearSpriteAnims call ClearSprites ret ; 11c2ac @@ -719,7 +719,7 @@ Function11c4be: ; 11c4be (47:44be) hlcoord 0, 14, AttrMap ld bc, $28 call ByteFill - callba ReloadMapPart + farcall ReloadMapPart ret ; 11c4db (47:44db) @@ -918,7 +918,7 @@ Function11c618: ; 11c618 (47:4618) hlcoord 0, 6, AttrMap ld bc, $c8 call ByteFill - callba ReloadMapPart + farcall ReloadMapPart ret ; 11c62a (47:462a) @@ -1372,7 +1372,7 @@ BCD2String: ; 11c8c7 xor a ld [hDividend + 2], a push hl - callba Function11a80c + farcall Function11a80c pop hl ld a, [wcd63] add "0" @@ -1530,7 +1530,7 @@ Function11c9ab: ; 11c9ab (47:49ab) hlcoord 0, 6, AttrMap ld bc, $c8 call ByteFill - callba ReloadMapPart + farcall ReloadMapPart ret Function11c9bd: ; 11c9bd (47:49bd) @@ -1620,7 +1620,7 @@ Function11ca19: ; 11ca19 (47:4a19) add hl, de dec c jr nz, .asm_11ca22 - callba ReloadMapPart + farcall ReloadMapPart ret ; 11ca38 (47:4a38) @@ -2043,7 +2043,7 @@ Function11cdaa: ; 11cdaa (47:4daa) hlcoord 0, 12, AttrMap ld bc, 4 * SCREEN_WIDTH call ByteFill - callba ReloadMapPart + farcall ReloadMapPart ret ; 11cdc7 (47:4dc7) diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index 8b21bb6a6..d3c1c0be3 100755 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -359,7 +359,7 @@ Function48304: ; 48304 (12:4304) ld a, $29 .asm_4833f ld [wMenuScrollPosition], a - callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap .asm_48348 call ScrollingMenu ld de, $629 @@ -385,7 +385,7 @@ Function48304: ; 48304 (12:4304) ld [wd003], a .asm_48377 call Function48187 - callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap jp Function4840c Function48383: ; 48383 (12:4383) @@ -1626,7 +1626,7 @@ Function48c8e: ; 48c8e ld hl, $d02a ld d, h ld e, l - callba Function48c63 + farcall Function48c63 hlcoord 10, 7 call PlaceString call WaitBGMap diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index 37179c122..ba663cf86 100755 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -311,17 +311,17 @@ Function4aa22: ; 4aa22 call ClearBGPalettes Function4aa25: ; 4aa25 - callba LoadPartyMenuGFX - callba InitPartyMenuWithCancel + farcall LoadPartyMenuGFX + farcall InitPartyMenuWithCancel call Function4aad3 Function4aa34: ; 4aa34 ld a, PARTYMENUACTION_MOBILE ld [PartyMenuActionText], a - callba WritePartyMenuTilemap + farcall WritePartyMenuTilemap xor a ld [PartyMenuActionText], a - callba PrintPartyMenuText + farcall PrintPartyMenuText call Function4aab6 call WaitBGMap call SetPalettes @@ -443,7 +443,7 @@ Function4aad3: ; 4aad3 push bc push hl ld e, 0 - callba LoadMenuMonIcon + farcall LoadMenuMonIcon ld a, [hObjectStructIndexBuffer] inc a ld [hObjectStructIndexBuffer], a @@ -453,7 +453,7 @@ Function4aad3: ; 4aad3 jr nz, .loop call Function4aa7a - callba PlaySpriteAnimations + farcall PlaySpriteAnimations ret ; 4aafb @@ -683,7 +683,7 @@ Function4ac58: ; 4ac58 lb bc, 2, 18 hlcoord 1, 15 call ClearBox - callba FreezeMonIcons + farcall FreezeMonIcons ld hl, MenuDataHeader_0x4aca2 call LoadMenuDataHeader ld hl, wd019 @@ -823,13 +823,13 @@ UnknownText_0x4ad51: ; 0x4ad51 ; 0x4ad56 Function4ad56: ; 4ad56 - callba OpenPartyStats + farcall OpenPartyStats call WaitBGMap2 ret ; 4ad60 Function4ad60: ; 4ad60 - callba ManagePokemonMoves + farcall ManagePokemonMoves ret ; 4ad67 diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 59a858bcd..416f62df8 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -99,7 +99,7 @@ Function8919e: ; 8919e (22:519e) Function891ab: ; 891ab call Mobile22_SetBGMapMode1 - callba ReloadMapPart + farcall ReloadMapPart call Mobile22_SetBGMapMode0 ret ; 891b8 @@ -218,9 +218,9 @@ Mobile22_SetBGMapMode1: ; 89240 Function89245: ; 89245 (22:5245) - callba TryLoadSaveFile + farcall TryLoadSaveFile ret c - callba _LoadData + farcall _LoadData and a ret @@ -777,7 +777,7 @@ Function8956f: ; 8956f add hl, bc ld b, h ld c, l - callba GetMobileOTTrainerClass + farcall GetMobileOTTrainerClass ld a, c ld [TrainerClass], a ld a, [rSVBK] @@ -1222,13 +1222,13 @@ Function897af: ; 897af add hl, bc ld b, h ld c, l - callba GetMobileOTTrainerClass + farcall GetMobileOTTrainerClass ld a, c ld [TrainerClass], a xor a ld [CurPartySpecies], a ld de, VTiles2 tile $37 - callba GetTrainerPic + farcall GetTrainerPic pop bc ret ; 897d5 @@ -1616,7 +1616,7 @@ Function89a0c: ; 89a0c jr c, .asm_89a1c ld d, h ld e, l - callba Function11c08f + farcall Function11c08f ret .asm_89a1c @@ -1793,14 +1793,14 @@ Function89a57: ; 89a57 Function89b00: ; 89b00 (22:5b00) - callba MG_Mobile_Layout_LoadPals + farcall MG_Mobile_Layout_LoadPals ret ; 89b07 (22:5b07) Function89b07: ; 89b07 call Mobile22_SetBGMapMode0 call DelayFrame - callba Function4a3a7 + farcall Function4a3a7 ret ; 89b14 @@ -1812,7 +1812,7 @@ Function89b14: ; 89b14 ; 89b1e Function89b1e: ; 89b1e (22:5b1e) - callba Function4a485 + farcall Function4a485 call Function89b00 ret @@ -1827,7 +1827,7 @@ Function89b28: ; 89b28 (22:5b28) Function89b3b: ; 89b3b (22:5b3b) call Mobile22_SetBGMapMode0 - callba Function48cda + farcall Function48cda ret Function89b45: ; 89b45 @@ -2180,7 +2180,7 @@ Function89d0d: ; 89d0d (22:5d0d) ld [rSVBK], a call SetPalettes - callba PrintMail_ + farcall PrintMail_ call Mobile22_SetBGMapMode1 ld c, 24 call DelayFrames @@ -2218,7 +2218,7 @@ Function89d75: ; 89d75 (22:5d75) push hl call Mobile22_SetBGMapMode0 call _hl_ - callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap pop hl jr asm_89d90 @@ -2249,7 +2249,7 @@ asm_89d90: ; 89d90 (22:5d90) Function89dab: ; 89dab (22:5dab) call Mobile22_SetBGMapMode0 - callba MobileMenuJoypad + farcall MobileMenuJoypad call Mobile22_SetBGMapMode0 ld a, c ld hl, wMenuJoypadFilter @@ -2429,8 +2429,8 @@ Function89ee1: ; 89ee1 (22:5ee1) call ClearBGPalettes call Function893e2 call Mobile22_SetBGMapMode0 - callba Function4a3a7 - callba MG_Mobile_Layout_CreatePalBoxes + farcall Function4a3a7 + farcall MG_Mobile_Layout_CreatePalBoxes hlcoord 1, 0 call Function8a53d ret @@ -2958,8 +2958,8 @@ Function8a262: ; 8a262 (22:6262) call ClearBGPalettes call Function893e2 call Mobile22_SetBGMapMode0 - callba Function4a3a7 - callba MG_Mobile_Layout_CreatePalBoxes + farcall Function4a3a7 + farcall MG_Mobile_Layout_CreatePalBoxes hlcoord 1, 0 call Function8a53d hlcoord 12, 4 @@ -3052,8 +3052,8 @@ Function8a313: ; 8a313 (22:6313) Function8a31c: ; 8a31c (22:631c) push bc call Mobile22_SetBGMapMode0 - callba Function4a3a7 - callba MG_Mobile_Layout_CreatePalBoxes + farcall Function4a3a7 + farcall MG_Mobile_Layout_CreatePalBoxes hlcoord 1, 0 call Function8a53d hlcoord 12, 4 @@ -3095,7 +3095,7 @@ Function8a31c: ; 8a31c (22:631c) ret Function8a383: ; 8a383 (22:6383) - callba MobileMenuJoypad + farcall MobileMenuJoypad ld a, c ld hl, wMenuJoypadFilter and [hl] @@ -3656,7 +3656,7 @@ Function8a78c: ; 8a78c (22:678c) call Function891fe ld de, wd002 ld b, $5 - callba NamingScreen + farcall NamingScreen call OpenSRAMBank4 call Function8931b push bc @@ -3685,7 +3685,7 @@ Function8a7cb: ; 8a7cb (22:67cb) call Function891de ld de, wd008 ld c, $0 - callba Function17a68f + farcall Function17a68f jr c, .asm_8a7f4 ld hl, wd008 ld a, $ff @@ -4027,7 +4027,7 @@ Function8aa73: ; 8aa73 (22:6a73) call Function891de ld de, wd008 ld c, $0 - callba Function17a68f + farcall Function17a68f jr c, .asm_8aa9d ld hl, wd008 ld a, $ff @@ -4157,7 +4157,7 @@ Function8ab3b: ; 8ab3b (22:6b3b) Function8ab93: ; 8ab93 (22:6b93) call ClearBGPalettes call LoadStandardMenuDataHeader - callba Function105688 + farcall Function105688 call ClearSprites call Function891fe call Function89b28 diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index 321998dc7..dfba961e4 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -48,7 +48,7 @@ Function8b35d: ; 8b35d Function8b363: ; 8b363 push bc - callba Mobile_AlwaysReturnNotCarry + farcall Mobile_AlwaysReturnNotCarry pop bc ret ; 8b36c diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 79cba8310..a8a60343c 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -39,10 +39,10 @@ Function100022: ; 100022 ld [wcd23], a ld a, b ld [wcd24], a - callba Function10127e - callba MobileFunc_106462 - callba Function106464 ; load broken gfx - callba Function11615a ; init RAM + farcall Function10127e + farcall MobileFunc_106462 + farcall Function106464 ; load broken gfx + farcall Function11615a ; init RAM ld hl, VramState set 1, [hl] ret @@ -144,7 +144,7 @@ Function1000e8: ; 1000e8 ld hl, wcd29 bit 7, [hl] ret z - callba Function115dd3 + farcall Function115dd3 ld hl, wcd29 set 6, [hl] ret @@ -160,7 +160,7 @@ Function1000fa: ; 1000fa ld a, [wcd2b] and a jr nz, .asm_100117 - callba Function11619d + farcall Function11619d ld hl, wcd29 set 6, [hl] ret @@ -183,7 +183,7 @@ Function1000fa: ; 1000fa ld [wLinkMode], a ld a, $04 ld [wc314 + 5], a - callba Function11619d + farcall Function11619d ld hl, wcd29 set 6, [hl] pop af @@ -206,7 +206,7 @@ Function100144: ; 100144 ret z res 2, [hl] res 6, [hl] - callba HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTileMapToWRAMBank3 ret ; 100163 @@ -318,8 +318,8 @@ Function10016f: ; 10016f Function10020b: ; 10020b xor a ld [wc303], a - callba FadeOutPalettes - callba Function106464 + farcall FadeOutPalettes + farcall Function106464 call HideSprites call DelayFrame @@ -328,7 +328,7 @@ Function10020b: ; 10020b ld a, $01 ld [rSVBK], a - callba DisplayMobileError + farcall DisplayMobileError pop af ld [rSVBK], a @@ -337,7 +337,7 @@ Function10020b: ; 10020b Function100232: ; 100232 push de - callba Function106464 + farcall Function106464 call Function3f20 call UpdateSprites hlcoord 1, 2 @@ -378,7 +378,7 @@ Function100276: ; 100276 ret .asm_100296 - callba Script_reloadmappart + farcall Script_reloadmappart ld c, $04 ret @@ -388,7 +388,7 @@ Function100276: ; 100276 ret .asm_1002a5 - callba Script_reloadmappart + farcall Script_reloadmappart call Function1002ed ld c, $03 ret @@ -412,15 +412,15 @@ Function1002c9: ; 1002c9 ld hl, wcd2a bit 0, [hl] ret z - callba CleanUpBattleRAM - callba LoadPokemonData + farcall CleanUpBattleRAM + farcall LoadPokemonData ret ; 1002dc Function1002dc: ; 1002dc ld a, MAPSETUP_LINKRETURN ld [hMapEntryMethod], a - callba RunMapSetupScript + farcall RunMapSetupScript xor a ld [hMapEntryMethod], a call LoadStandardFont @@ -428,8 +428,8 @@ Function1002dc: ; 1002dc ; 1002ed Function1002ed: ; 1002ed - callba LoadOW_BGPal7 - callba ApplyPals + farcall LoadOW_BGPal7 + farcall ApplyPals ld a, $01 ld [hCGBPalUpdate], a call DelayFrame @@ -440,21 +440,21 @@ Function100301: ; 100301 ld hl, wcd2a bit 1, [hl] ret z - callba Function106464 - callba Function10202c - callba Function115dd3 + farcall Function106464 + farcall Function10202c + farcall Function115dd3 call Function100320 call JoyWaitAorB ret ; 100320 Function100320: ; 100320 - callba Mobile_ReloadMapPart + farcall Mobile_ReloadMapPart ret ; 100327 Function100327: ; 100327 - callba HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTileMapToWRAMBank3 ret ; 100327 @@ -858,7 +858,7 @@ Function100545: ; 100545 ; 10054d Function10054d: ; 10054d - callba MobileMenuJoypad + farcall MobileMenuJoypad ld a, c ld hl, wMenuJoypadFilter and [hl] @@ -1500,7 +1500,7 @@ Function100902: ; 100902 call PrintNum ld de, SFX_TWO_PC_BEEPS call PlaySFX - callba ReloadMapPart + farcall ReloadMapPart ld c, $3c call DelayFrames ret @@ -1511,7 +1511,7 @@ Function100902: ; 100902 call PlaceString ld de, SFX_4_NOTE_DITTY call PlaySFX - callba ReloadMapPart + farcall ReloadMapPart ld c, 120 call DelayFrames ret @@ -1541,7 +1541,7 @@ Function100989: ; 100989 decoord 0, 0 call Function1009a5 call Function1009ae - callba ReloadMapPart + farcall ReloadMapPart ld hl, w3_dd68 decoord 0, 0, AttrMap call Function1009a5 @@ -1628,14 +1628,14 @@ Function1009f3: ; 1009f3 _LinkBattleSendReceiveAction: ; 100a09 call .StageForSend ld [wd431], a - callba PlaceWaitingText + farcall PlaceWaitingText ld a, [wLinkMode] cp LINK_MOBILE jr nz, .not_mobile call .MobileBattle_SendReceiveAction call Function100da5 - callba FinishBattleAnim + farcall FinishBattleAnim jr .done .not_mobile @@ -1711,7 +1711,7 @@ _LinkBattleSendReceiveAction: ; 100a09 .asm_100a92 call DelayFrame call GetJoypad - callba Function100382 + farcall Function100382 ld c, $01 ld b, $03 push bc @@ -1810,7 +1810,7 @@ Function100b12: ; 100b12 ld [wMenuCursorBuffer], a call Function100e72 call Function100b45 - callba InitPartyMenuBGPal7 + farcall InitPartyMenuBGPal7 call Function100ed4 ld a, [wMenuCursorBuffer] ld [wBattleMenuCursorBuffer], a @@ -1822,16 +1822,16 @@ Function100b45: ; 100b45 call Function100b7a .loop call Mobile_SetOverworldDelay - callba MobileMenuJoypad + farcall MobileMenuJoypad push bc - callba HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTileMapToWRAMBank3 call Function100e2d pop bc jr c, .asm_100b6b ld a, [wMenuJoypadFilter] and c jr z, .loop - callba Mobile_GetMenuSelection + farcall Mobile_GetMenuSelection ret .asm_100b6b @@ -1848,11 +1848,11 @@ Function100b7a: ; 100b7a ld hl, CopyMenuData2 ld a, [wMenuData2_2DMenuItemStringsBank] rst FarCall - callba Draw2DMenu - callba MobileTextBorder + farcall Draw2DMenu + farcall MobileTextBorder call UpdateSprites call ApplyTilemap - callba Init2DMenuCursorPosition + farcall Init2DMenuCursorPosition ld hl, w2DMenuFlags1 set 7, [hl] ret @@ -1861,14 +1861,14 @@ Function100b7a: ; 100b7a MobileMoveSelectionScreen: ; 100b9f xor a ld [wMoveSwapBuffer], a - callba CheckPlayerHasUsableMoves + farcall CheckPlayerHasUsableMoves ret z call Function100dd8 jp c, xor_a_dec_a call Function100e72 call .GetMoveSelection push af - callba InitPartyMenuBGPal7 + farcall InitPartyMenuBGPal7 call Function100ed4 pop af ret @@ -1880,12 +1880,12 @@ MobileMoveSelectionScreen: ; 100b9f call Function100c74 call Function100c98 .master_loop - callba MoveInfoBox + farcall MoveInfoBox .loop call Mobile_SetOverworldDelay - callba MobileMenuJoypad + farcall MobileMenuJoypad push bc - callba HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTileMapToWRAMBank3 call Function100e2d pop bc jr c, .b_button @@ -2016,10 +2016,10 @@ Mobile_PartyMenuSelect: ; 100cb5 res 6, [hl] .loop call Mobile_SetOverworldDelay - callba MobileMenuJoypad + farcall MobileMenuJoypad push bc - callba PlaySpriteAnimations - callba HDMATransferTileMapToWRAMBank3 + farcall PlaySpriteAnimations + farcall HDMATransferTileMapToWRAMBank3 call MobileComms_CheckInactivityTimer pop bc jr c, .done @@ -2070,10 +2070,10 @@ MobileBattleMonMenu: ; 100d22 res 6, [hl] .asm_100d30 call Mobile_SetOverworldDelay - callba MobileMenuJoypad + farcall MobileMenuJoypad push bc - callba PlaySpriteAnimations - callba HDMATransferTileMapToWRAMBank3 + farcall PlaySpriteAnimations + farcall HDMATransferTileMapToWRAMBank3 call MobileComms_CheckInactivityTimer pop bc jr c, .asm_100d54 @@ -2181,13 +2181,13 @@ Mobile_SetOverworldDelay: ; 100dd2 Function100dd8: ; 100dd8 ld c, $01 ld b, $03 - callba AdvanceMobileInactivityTimerAndCheckExpired + farcall AdvanceMobileInactivityTimerAndCheckExpired jr c, .asm_100dfb ld c, $3c ld b, $01 call Function10079c jr c, .asm_100dfb - callba Function10032e + farcall Function10032e ld a, [wcd2b] and a jr nz, .asm_100dfb @@ -2207,7 +2207,7 @@ MobileComms_CheckInactivityTimer: ; 100dfd ld c, a ld b, 3 push bc - callba AdvanceMobileInactivityTimerAndCheckExpired ; useless to farcall + farcall AdvanceMobileInactivityTimerAndCheckExpired ; useless to farcall pop bc jr c, .quit ld b, 1 @@ -2215,7 +2215,7 @@ MobileComms_CheckInactivityTimer: ; 100dfd jr c, .quit call Function1009f3 jr c, .quit - callba Function10032e ; useless to farcall + farcall Function10032e ; useless to farcall ld a, [wcd2b] and a jr nz, .quit @@ -2235,7 +2235,7 @@ Function100e2d: ; 100e2d ld c, a ld b, 3 push bc - callba AdvanceMobileInactivityTimerAndCheckExpired + farcall AdvanceMobileInactivityTimerAndCheckExpired pop bc jr c, .asm_100e61 ld b, 1 @@ -2243,7 +2243,7 @@ Function100e2d: ; 100e2d jr c, .asm_100e61 call Function1009f3 jr c, .asm_100e61 - callba Function10032e + farcall Function10032e ld a, [wcd2b] and a jr nz, .asm_100e61 @@ -2340,13 +2340,13 @@ Function100ec5 ; 100eca Function100eca: ; 100eca - callba Mobile_InitPartyMenuBGPal7 + farcall Mobile_InitPartyMenuBGPal7 call Function100ed4 ret ; 100ed4 Function100ed4: ; 100ed4 - callba ApplyPals + farcall ApplyPals ld a, $01 ld [hCGBPalUpdate], a ret @@ -2884,7 +2884,7 @@ Function101265: ; 101265 Function10126c: ; 10126c call UpdateSprites - callba Script_reloadmappart + farcall Script_reloadmappart ld hl, UnknownText_0x1021f4 call Function1021e0 ret @@ -3042,7 +3042,7 @@ Jumptable_101297: ; 101297 ; 10138b Function10138b: ; 10138b - callba Function8adcc + farcall Function8adcc ld c, 0 jr c, .asm_101396 inc c @@ -3069,22 +3069,22 @@ Function1013aa: ; 1013aa call ClearBGPalettes call Call_ExitMenu call ReloadTilesetAndPalettes - callba Function106464 + farcall Function106464 call UpdateSprites call FinishExitMenu ret ; 1013c0 Function1013c0: ; 1013c0 - callba BlankScreen - callba MobileFunc_106462 - callba Function106464 + farcall BlankScreen + farcall MobileFunc_106462 + farcall Function106464 call FinishExitMenu ret ; 1013d6 Function1013d6: ; 1013d6 - callba HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrMapAndTileMapToWRAMBank3 ret ; 1013dd @@ -3177,7 +3177,7 @@ Function101418: ; 101418 Function10142c: ; 10142c ld a, $01 ld [wc305], a - callba Function115e18 + farcall Function115e18 ret ; 101438 @@ -3277,8 +3277,8 @@ Function1014b7: ; 1014b7 ; 1014ce Function1014ce: ; 1014ce - callba Function100720 - callba StartMobileInactivityTimer + farcall Function100720 + farcall StartMobileInactivityTimer ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a @@ -3297,7 +3297,7 @@ Function1014e2: ; 1014e2 ; 1014f4 Function1014f4: ; 1014f4 - callba EnableMobile + farcall EnableMobile ld hl, wcd29 set 6, [hl] ld a, [wMobileCommsJumptableIndex] @@ -3346,7 +3346,7 @@ Function101537: ; 101537 ; 101544 Function101544: ; 101544 - callba StartMobileInactivityTimer + farcall StartMobileInactivityTimer ld a, $12 call Function3e32 ld a, [wMobileCommsJumptableIndex] @@ -3356,7 +3356,7 @@ Function101544: ; 101544 ; 101557 Function101557: ; 101557 - callba StartMobileInactivityTimer + farcall StartMobileInactivityTimer ld hl, wcd53 ld a, $08 call Function3e32 @@ -3371,7 +3371,7 @@ Function10156d: ; 10156d ret c Function101571: ; 101571 - callba Function10032e + farcall Function10032e ret c ret z ld a, e @@ -3388,7 +3388,7 @@ Function101571: ; 101571 ; 10158a Function10158a: ; 10158a - callba IncrementMobileInactivityTimerBy1Frame + farcall IncrementMobileInactivityTimerBy1Frame ld a, [wMobileInactivityTimerMinutes] cp $0a jr c, Function10156d @@ -3399,7 +3399,7 @@ Function10158a: ; 10158a Function10159d: ; 10159d ld de, wc608 - callba Function100edf + farcall Function100edf ld de, wc608 ld a, $05 ld hl, w5_d800 @@ -3414,7 +3414,7 @@ Function10159d: ; 10159d Function1015be: ; 1015be ld de, wc608 - callba Function100eed + farcall Function100eed ld de, wc608 ld a, $05 ld hl, w5_d800 @@ -3429,7 +3429,7 @@ Function1015be: ; 1015be Function1015df: ; 1015df ld de, wc608 - callba Function100ef4 + farcall Function100ef4 ld de, wc608 ld a, $05 ld hl, w5_d800 @@ -3449,7 +3449,7 @@ Function101600: ; 101600 ld a, $05 call FarCopyWRAM ld de, wc608 - callba Function100ee6 + farcall Function100ee6 ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a @@ -3536,11 +3536,11 @@ Function10168a: ; 10168a Function10168e: ; 10168e ld b, 0 ld c, $01 - callba Function10079c + farcall Function10079c ret c ld c, $01 ld b, $03 - callba AdvanceMobileInactivityTimerAndCheckExpired + farcall AdvanceMobileInactivityTimerAndCheckExpired ret c ld a, [wcd26] ld hl, Jumptable_1016c3 @@ -3604,7 +3604,7 @@ Function1016f8: ; 1016f8 ; 101705 Function101705: ; 101705 - callba Function100382 + farcall Function100382 ld a, [wcd27] bit 7, a ret z @@ -3769,13 +3769,13 @@ Function1017f1: ; 1017f1 Function1017f5: ; 1017f5 ld b, 0 ld c, $01 - callba Function10079c + farcall Function10079c ret c ld c, $01 ld b, $03 - callba AdvanceMobileInactivityTimerAndCheckExpired + farcall AdvanceMobileInactivityTimerAndCheckExpired ret c - callba Function100382 + farcall Function100382 ld a, [wcd27] bit 7, a jr nz, .next @@ -3808,7 +3808,7 @@ Function101826: ; 101826 ret .asm_101844 - callba Function103654 + farcall Function103654 ld a, c ld hl, Unknown_101882 cp $01 @@ -3965,7 +3965,7 @@ Function101913: ; 101913 Function10194b: ; 10194b call DisableSpriteUpdates call ClearSprites - callba Function1021f9 + farcall Function1021f9 ld hl, wcd29 bit 3, [hl] jr nz, .asm_101967 @@ -3981,8 +3981,8 @@ Function10194b: ; 10194b ; 10196d _SelectMonsForMobileBattle: ; 10196d - callba BlankScreen - callba Mobile_CommunicationStandby + farcall BlankScreen + farcall Mobile_CommunicationStandby ld hl, wcd29 set 5, [hl] ld hl, wcd2a @@ -4008,16 +4008,16 @@ _SelectMonsForMobileBattle: ; 10196d _StartMobileBattle: ; 1019ab call CopyOtherPlayersBattleMonSelection - callba Function100754 + farcall Function100754 xor a ld [wdc5f], a ld [wdc60], a - callba BlankScreen + farcall BlankScreen call SpeechTextBox - callba Function100846 + farcall Function100846 ld c, 120 call DelayFrames - callba ClearTileMap + farcall ClearTileMap call .CopyOTDetails call StartMobileBattle ld a, [wcd2b] @@ -4040,7 +4040,7 @@ _StartMobileBattle: ; 1019ab ld bc, w5_dc0d ld de, w5_dc11 - callba GetMobileOTTrainerClass + farcall GetMobileOTTrainerClass pop af ld [rSVBK], a @@ -4071,9 +4071,9 @@ StartMobileBattle: ; 101a21 ld [hl], a ld a, 1 ld [wDisableTextAcceleration], a - callba BattleIntro - callba DoBattle - callba ShowLinkBattleParticipantsAfterEnd + farcall BattleIntro + farcall DoBattle + farcall ShowLinkBattleParticipantsAfterEnd xor a ld [wDisableTextAcceleration], a ld a, $ff @@ -4086,11 +4086,11 @@ StartMobileBattle: ; 101a21 Function101a4f: ; 101a4f ld a, 1 ld [wDisableTextAcceleration], a - callba DisplayLinkBattleResult + farcall DisplayLinkBattleResult xor a ld [wDisableTextAcceleration], a - callba CleanUpBattleRAM - callba LoadPokemonData + farcall CleanUpBattleRAM + farcall LoadPokemonData call Function1013c0 ld a, [wMobileCommsJumptableIndex] inc a @@ -4104,14 +4104,14 @@ CopyOtherPlayersBattleMonSelection: ; 101a75 ld bc, 3 call CopyBytes ld de, wcc64 - callba Function100772 - callba Function101050 - callba LoadSelectedPartiesForColosseum + farcall Function100772 + farcall Function101050 + farcall LoadSelectedPartiesForColosseum ret ; 101a97 Function101a97: ; 101a97 - callba Function115d99 + farcall Function115d99 ld hl, wcd29 set 7, [hl] ld c, $02 @@ -4136,7 +4136,7 @@ Function101ab4: ; 101ab4 ; 101ac6 Function101ac6: ; 101ac6 - callba Function115d99 + farcall Function115d99 ld hl, wcd29 set 7, [hl] ld c, $02 @@ -4154,7 +4154,7 @@ Function101ac6: ; 101ac6 ; 101aed Function101aed: ; 101aed - callba Function115d99 + farcall Function115d99 ld hl, wcd29 set 7, [hl] ld c, $02 @@ -4185,7 +4185,7 @@ Function101b0f: ; 101b0f ; 101b2b Function101b2b: ; 101b2b - callba Function100579 + farcall Function100579 ld hl, wcd29 set 2, [hl] ld a, [wcd26] @@ -4238,7 +4238,7 @@ Function101b70: ; 101b70 ; 101b8f Function101b8f: ; 101b8f - callba Function1005c3 + farcall Function1005c3 ld hl, wcd29 set 2, [hl] ld a, [wcd26] @@ -4282,7 +4282,7 @@ Function101bc8: ; 101bc8 ; 101be5 Function101be5: ; 101be5 - callba Function100579 + farcall Function100579 ld hl, wcd29 set 2, [hl] ld a, [wcd26] @@ -4352,7 +4352,7 @@ Function101c50: ; 101c50 ; 101c62 Function101c62: ; 101c62 - callba Function115d99 + farcall Function115d99 ld hl, wcd29 set 7, [hl] ld c, $01 @@ -4374,7 +4374,7 @@ Function101c62: ; 101c62 ; 101c92 Function101c92: ; 101c92 - callba Function100675 + farcall Function100675 ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a @@ -4520,7 +4520,7 @@ Function101d6b: ; 101d6b ; 101d7b Function101d7b: ; 101d7b - callba Function10138b + farcall Function10138b ld b, 0 ld hl, Unknown_101d8d add hl, bc @@ -4550,7 +4550,7 @@ Function101d95: ; 101d95 ; 101db2 Function101db2: ; 101db2 - callba Function103302 + farcall Function103302 call ExitMenu ld hl, wcd29 set 5, [hl] @@ -4701,7 +4701,7 @@ Function101e8d: ; 101e8d ; unreferenced Function101e98: ; 101e98 call ClearSprites - callba Function8adb3 + farcall Function8adb3 ret c ld hl, GameTimerPause set 7, [hl] @@ -4741,7 +4741,7 @@ Function101ecc: ; 101ecc Function101ed3: ; 101ed3 call Function1013aa - callba Function115d99 + farcall Function115d99 ld hl, wcd29 set 7, [hl] ret @@ -4758,7 +4758,7 @@ Function101ee4: ; 101ee4 ld a, [hli] ld d, [hl] ld e, a - callba Function100504 + farcall Function100504 ret ; 101ef5 @@ -4835,7 +4835,7 @@ String_102014: ; 102014 ; 10202c Function10202c: ; 10202c - callba Function115d99 + farcall Function115d99 ld hl, wcd29 set 7, [hl] ld c, $02 @@ -4930,7 +4930,7 @@ Function1020a8: ; 1020a8 call Function10209c ld c, $01 ld de, wdc42 - callba Function17a68f + farcall Function17a68f ret c call Function10208e call Function102068 @@ -4940,7 +4940,7 @@ Function1020a8: ; 1020a8 Function1020bf: ; 1020bf call ClearSprites - callba Function8aba9 + farcall Function8aba9 ld a, c and a jr z, .asm_1020e8 @@ -5074,7 +5074,7 @@ Function10219f: ; 10219f call FadeToMenu call Function10218d ld de, wc608 + 1 - callba Function8ac4e + farcall Function8ac4e call JoyWaitAorB call PlayClickSFX call Function1013aa @@ -5085,7 +5085,7 @@ Function1021b8: ; 1021b8 call FadeToMenu call Function10218d ld de, wPlayerMoveStruct - callba Function8ac70 + farcall Function8ac70 ld a, c ld [StringBuffer1], a push af @@ -5191,7 +5191,7 @@ Function10224b: ; 10224b .asm_10225e res 1, [hl] res 2, [hl] - callba Mobile_ReloadMapPart + farcall Mobile_ReloadMapPart scf ret ; 10226a @@ -5267,7 +5267,7 @@ Function1022ca: ; 1022ca ; 1022d0 Function1022d0: ; 1022d0 - callba Function10032e + farcall Function10032e ld a, [wcd2b] and a jr nz, .asm_1022f3 @@ -5278,7 +5278,7 @@ Function1022d0: ; 1022d0 sub c ld c, a ld b, $03 - callba AdvanceMobileInactivityTimerAndCheckExpired + farcall AdvanceMobileInactivityTimerAndCheckExpired jr c, .asm_1022f3 xor a ret @@ -5413,7 +5413,7 @@ Function1023c6: ; 1023c6 ld [CurPartyMon], a xor a ld [wPokemonWithdrawDepositParameter], a - callba RemoveMonFromPartyOrBox + farcall RemoveMonFromPartyOrBox ld hl, PartyCount inc [hl] ld a, [hli] @@ -5453,9 +5453,9 @@ Function102416: ; 102416 Function102423: ; 102423 call Function102921 ret nc - callba SaveAfterLinkTrade - callba TrainerRankings_Trades - callba BackupMobileEventIndex + farcall SaveAfterLinkTrade + farcall TrainerRankings_Trades + farcall BackupMobileEventIndex ld hl, wcd4b set 1, [hl] ld a, 0 @@ -5523,7 +5523,7 @@ Function102496: ; 102496 ; 1024a8 Function1024a8: ; 1024a8 - callba Function1009f3 + farcall Function1009f3 ret c Function1024af: ; 1024af @@ -5608,7 +5608,7 @@ Function10250c: ; 10250c call Function102b9c call Function102bdc jr c, .asm_10256d - callba Functionfb5dd + farcall Functionfb5dd jr c, .asm_102568 ld hl, wcd4b set 1, [hl] @@ -5726,9 +5726,9 @@ Function1025e9: ; 1025e9 Function1025ff: ; 1025ff ld hl, wcd4b set 2, [hl] - callba Function1009f3 + farcall Function1009f3 ret c - callba MobileMenuJoypad + farcall MobileMenuJoypad ld a, [wMenuJoypadFilter] and c ret z @@ -5788,9 +5788,9 @@ Function102652: ; 102652 Function10266b: ; 10266b ld hl, wcd4b set 2, [hl] - callba Function1009f3 + farcall Function1009f3 ret c - callba MobileMenuJoypad + farcall MobileMenuJoypad ld a, [wMenuJoypadFilter] and c ret z @@ -5840,7 +5840,7 @@ Function1026b7: ; 1026b7 Function1026c8: ; 1026c8 call GetJoypad - callba Function1009f3 + farcall Function1009f3 ret c ld a, [wcd4a] ld hl, Jumptable_1026da @@ -5920,7 +5920,7 @@ Function102738: ; 102738 Function102754: ; 102754 call GetJoypad - callba Function1009f3 + farcall Function1009f3 ret c ld a, [wcd4a] ld hl, Jumptable_102766 @@ -6017,7 +6017,7 @@ Function1027eb: ; 1027eb ld c, 18 ld d, h ld e, l - callba _LinkTextbox + farcall _LinkTextbox ld de, .Stats_Trade hlcoord 2, 16 call PlaceString @@ -6154,7 +6154,7 @@ Function1028e8: ; 1028e8 ld hl, wcd4b res 6, [hl] ld [wcd50], a - callba StartMobileInactivityTimer + farcall StartMobileInactivityTimer ld a, 0 ld [wcd4a], a ret @@ -6162,7 +6162,7 @@ Function1028e8: ; 1028e8 Function1028fc: ; 1028fc call GetJoypad - callba Function1009f3 + farcall Function1009f3 jr nc, .asm_102909 and a ret @@ -6238,7 +6238,7 @@ Function10295d: ; 10295d ; 10296e Function10296e: ; 10296e - callba Function100382 + farcall Function100382 and a ld a, [wcd27] bit 7, a @@ -6251,7 +6251,7 @@ Function10296e: ; 10296e ; 102984 Function102984: ; 102984 - callba Function100382 + farcall Function100382 and a ld a, [wcd27] bit 7, a @@ -6313,7 +6313,7 @@ Function1029cf: ; 1029cf ld c, 8 ld d, h ld e, l - callba _LinkTextbox + farcall _LinkTextbox ld de, String_102a26 hlcoord 12, 8 call PlaceString @@ -6329,9 +6329,9 @@ Function1029cf: ; 1029cf ; 1029fe Function1029fe: ; 1029fe - callba Function1009f3 + farcall Function1009f3 ret c - callba MobileMenuJoypad + farcall MobileMenuJoypad ld a, c ld hl, wMenuJoypadFilter and [hl] @@ -6410,7 +6410,7 @@ Function102a3b: ; 102a3b call GetPartyLocation ld b, h ld c, l - callba GetCaughtGender + farcall GetCaughtGender ld a, c ld [wPlayerTrademonCaughtData], a ld hl, OTPlayerName @@ -6455,7 +6455,7 @@ Function102a3b: ; 102a3b call GetPartyLocation ld b, h ld c, l - callba GetCaughtGender + farcall GetCaughtGender ld a, c ld [wOTTrademonCaughtData], a ret @@ -6469,11 +6469,11 @@ Function102b12: ; 102b12 ld a, [wcd2f] and a jr nz, .asm_102b2b - callba Function108026 + farcall Function108026 jr .asm_102b31 .asm_102b2b - callba Function10802a + farcall Function10802a .asm_102b31 ret @@ -6485,7 +6485,7 @@ Function102b32: ; 102b32 ld [CurPartyMon], a ld a, $01 ld [wForceEvolution], a - callba EvolvePokemon + farcall EvolvePokemon call Function102d9a call Function102dd3 call Function102dec @@ -6558,7 +6558,7 @@ Function102bac: ; 102bac ld [CurPartyMon], a call LowVolume call ClearSprites - callba _MobileStatsScreenInit + farcall _MobileStatsScreenInit ld a, [CurPartyMon] inc a ld [wMenuCursorY], a @@ -6645,7 +6645,7 @@ Function102c3b: ; 102c3b ; 102c48 Function102c48: ; 102c48 - callba Function10165a + farcall Function10165a ld a, 0 call GetSRAMBank ld hl, $a600 @@ -6797,7 +6797,7 @@ Function102d48: ; 102d48 ld hl, PartyMon1DVs call AddNTimes predef GetUnownLetter - callba UpdateUnownDex + farcall UpdateUnownDex ld a, [wFirstUnownSeen] and a jr nz, .asm_102d98 @@ -6818,7 +6818,7 @@ Function102d9a: ; 102d9a hlcoord 0, 0, AttrMap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill - callba HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrMapAndTileMapToWRAMBank3 ret ; 102db7 @@ -6836,7 +6836,7 @@ Function102dc3: ; 102dc3 ld c, 18 ld d, h ld e, l - callba _LinkTextbox + farcall _LinkTextbox ret ; 102dd3 @@ -6846,7 +6846,7 @@ Function102dd3: ; 102dd3 ld hl, VTiles0 lb bc, BANK(GFX_1032a2), 4 call Get2bpp - callba __LoadTradeScreenBorder + farcall __LoadTradeScreenBorder call EnableLCD ret ; 102dec @@ -6857,7 +6857,7 @@ Function102dec: ; 102dec ld bc, 4 palettes ld a, $05 call FarCopyWRAM - callba Function49742 + farcall Function49742 call SetPalettes call DelayFrame ret @@ -6880,7 +6880,7 @@ Function102e07: ; 102e07 ld c, 11 ld d, h ld e, l - callba _LinkTextbox + farcall _LinkTextbox .okay ld de, .waiting @@ -6905,8 +6905,8 @@ Function102e3e: ; 102e3e ; 102e4f Function102e4f: ; 102e4f - callba Function16d42e - callba _InitMG_Mobile_LinkTradePalMap + farcall Function16d42e + farcall _InitMG_Mobile_LinkTradePalMap ld de, PlayerName hlcoord 4, 0 call PlaceString @@ -7399,7 +7399,7 @@ Function103309: ; 103309 ld [wd1ee], a call Function1034be call UpdateSprites - callba HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrMapAndTileMapToWRAMBank3 ld a, $01 ld [wd1f0], a call Function10339a @@ -7413,7 +7413,7 @@ Function103362: ; 103362 call Function1033af call Function10339a call Function10342c - callba HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTileMapToWRAMBank3 ld a, [Buffer2] bit 7, a jr z, .asm_103362 @@ -7707,7 +7707,7 @@ String_1035c1: db "けってい@" ; 1035c6 Function1035c6: ; 1035c6 - callba Function10138b + farcall Function10138b ld b, 0 ld hl, Unknown_1035d7 add hl, bc @@ -7799,7 +7799,7 @@ MenuData2_103648: ; 103648 ; 103654 Function103654: ; 103654 - callba Mobile_AlwaysReturnNotCarry + farcall Mobile_AlwaysReturnNotCarry bit 7, c jr nz, .asm_103666 ld hl, wcd2a @@ -7815,14 +7815,14 @@ Function103654: ; 103654 ; 10366e Mobile_SelectThreeMons: ; 10366e - callba Mobile_AlwaysReturnNotCarry + farcall Mobile_AlwaysReturnNotCarry bit 7, c jr z, .asm_10369b ld hl, UnknownText_0x10375d call PrintText call YesNoBox jr c, .asm_103696 - callba CheckForMobileBattleRules + farcall CheckForMobileBattleRules jr nc, .asm_103690 call JoyWaitAorB jr .asm_103696 @@ -7867,7 +7867,7 @@ Mobile_SelectThreeMons: ; 10366e jr .asm_1036b5 .asm_1036d9 - callba CheckForMobileBattleRules + farcall CheckForMobileBattleRules jr nc, .asm_1036e6 call JoyWaitAorB jr .asm_1036f4 @@ -7899,7 +7899,7 @@ Function103700: ; 103700 ld hl, SwarmFlags bit 4, [hl] jr z, .asm_10370f - callba Function1008a6 + farcall Function1008a6 .asm_10370f ld a, c @@ -8003,7 +8003,7 @@ Function10378c: ; 10378c .already_set push bc - callba Link_SaveGame + farcall Link_SaveGame pop bc jr c, .failed_to_save ld a, $01 @@ -8011,7 +8011,7 @@ Function10378c: ; 10378c ld a, c and a ret z - callba Function1006fd + farcall Function1006fd ret .failed_to_save @@ -8089,10 +8089,10 @@ UnknownText_0x10381e: ; 0x10381e ; 0x103823 Function103823: ; 103823 - callba Mobile_AlwaysReturnNotCarry + farcall Mobile_AlwaysReturnNotCarry bit 7, c jr nz, .asm_103838 - callba Function1008a6 + farcall Function1008a6 ld a, c cp $01 jr c, .asm_10383a @@ -8117,8 +8117,8 @@ Function10383c: ; 10383c ld hl, UnknownText_0x103876 call PrintText call JoyWaitAorB - callba Script_reloadmappart - callba Function4a94e + farcall Script_reloadmappart + farcall Function4a94e jr c, .asm_103870 ld hl, wd002 ld de, wPlayerMonSelection @@ -8140,10 +8140,10 @@ UnknownText_0x103876: ; 0x103876 ; 0x10387b Function10387b: ; 10387b - callba Mobile_AlwaysReturnNotCarry + farcall Mobile_AlwaysReturnNotCarry bit 7, c ret nz - callba Function1008a6 + farcall Function1008a6 ld a, c ld [StringBuffer2], a ld hl, UnknownText_0x103898 diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index 9ab9f7ed2..7e1d20db6 100755 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -1027,7 +1027,7 @@ Function106464:: ; 106464 ld hl, VTiles2 tile $6b ld b, $f ; XXX no graphics at 0f:40b0 call Get2bpp - callba LoadFrame + farcall LoadFrame ret ; 10649b diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index 98bbcf485..6b9db7741 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -175,7 +175,7 @@ Function1080b7: ; 1080b7 ld [hWX], a ld a, $90 ld [hWY], a - callba ClearSpriteAnims + farcall ClearSpriteAnims call DelayFrame @@ -237,7 +237,7 @@ Function108157: ; 108157 ld [hWX], a ld a, $90 ld [hWY], a - callba ClearSpriteAnims + farcall ClearSpriteAnims xor a ld hl, wSpriteAnimDict ld [hli], a @@ -361,8 +361,8 @@ MobileTradeAnim_JumptableLoop: ; 10824b ld [hWY], a call LoadStandardFont call LoadFontsBattleExtra - callba MobileFunc_106462 - callba Function106464 + farcall MobileFunc_106462 + farcall Function106464 scf ret ; 10827b @@ -433,7 +433,7 @@ EndMobileTradeAnim: ; 1082c6 WaitMobileTradeSpriteAnims: ; 1082cc .loop push bc - callba PlaySpriteAnimations + farcall PlaySpriteAnimations pop bc call DelayFrame dec c @@ -443,9 +443,9 @@ WaitMobileTradeSpriteAnims: ; 1082cc Function1082db: ; 1082db .loop - callba PlaySpriteAnimations - callba SetUpPokeAnim - callba HDMATransferTileMapToWRAMBank3 + farcall PlaySpriteAnimations + farcall SetUpPokeAnim + farcall HDMATransferTileMapToWRAMBank3 jr nc, .loop ret ; 1082f0 @@ -464,7 +464,7 @@ Function1082fa: ; 1082fa call Function108b78 push hl push bc - callba PlaySpriteAnimations + farcall PlaySpriteAnimations pop bc pop hl call DelayFrame @@ -552,7 +552,7 @@ MobileTradeAnim_ShowOTMonFromTrade: ; 10839b ld de, VTiles2 call Function108201 call EnableLCD - callba DeinitializeAllSprites + farcall DeinitializeAllSprites xor a ld [hSCX], a ld [hSCY], a @@ -687,7 +687,7 @@ MobileTradeAnim_ShowOTMonFromGTS: ; 1084d7 ld de, VTiles2 call Function108201 call EnableLCD - callba DeinitializeAllSprites + farcall DeinitializeAllSprites call DelayFrame ld de, TradeBallGFX ld hl, VTiles0 @@ -756,7 +756,7 @@ MobileTradeAnim_GetOddEgg: ; 108589 ld de, VTiles2 call Function108201 call EnableLCD - callba DeinitializeAllSprites + farcall DeinitializeAllSprites call DelayFrame ld de, TradeBallGFX ld hl, VTiles0 @@ -813,7 +813,7 @@ MobileTradeAnim_GetOddEgg: ; 108589 ; 108638 MobileTradeAnim_02: ; 108638 - callba DeinitializeAllSprites + farcall DeinitializeAllSprites call ClearBGPalettes call ClearSprites call ClearTileMap @@ -849,7 +849,7 @@ MobileTradeAnim_02: ; 108638 ; 108689 MobileTradeAnim_10: ; 108689 - callba DeinitializeAllSprites + farcall DeinitializeAllSprites call ClearBGPalettes call ClearSprites call ClearTileMap @@ -1097,7 +1097,7 @@ MobileTradeAnim_GetTrademon1: ; 108863 jr .loop .done - callba DeinitializeAllSprites + farcall DeinitializeAllSprites depixel 9, 10, 2, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_25 call _InitSpriteAnimStruct @@ -1189,7 +1189,7 @@ MobileTradeAnim_GetTrademon3: ; 10890a MobileTradeAnim_0f: ; 108919 ld c, 40 call WaitMobileTradeSpriteAnims - callba DeinitializeAllSprites + farcall DeinitializeAllSprites call ClearBGPalettes call ClearSprites call ClearTileMap @@ -1571,7 +1571,7 @@ Function108b98: ; 108b98 ; 108bbd MobileTradeAnim_DeleteSprites: ; 108bbd - callba DeinitializeAllSprites + farcall DeinitializeAllSprites call ClearSprites ret ; 108bc7 @@ -1590,7 +1590,7 @@ Function108bc7: ; 108bc7 (42:4bc7) ret .delete - callba DeinitializeSprite + farcall DeinitializeSprite ret Function108be0: ; 108be0 (42:4be0) diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index 6c581de87..b804bb473 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -6838,7 +6838,7 @@ Unknown_117356: ; 117356 SECTION "Mobile Stadium", ROMX Special_GiveOddEgg: ; 117656 - callba GiveOddEgg + farcall GiveOddEgg ret ; 11765d @@ -6898,9 +6898,9 @@ Function117699: ; 117699 (45:7699) call ByteFill call ClearBGPalettes call ClearSprites - callba Function171c87 - callba ReloadMapPart - callba ClearSpriteAnims + farcall Function171c87 + farcall ReloadMapPart + farcall ClearSpriteAnims ret Function1176ee: ; 1176ee (45:76ee) @@ -6910,12 +6910,12 @@ Function1176ee: ; 1176ee (45:76ee) bit 7, a jr nz, .quit call Function117719 - callba PlaySpriteAnimations - callba ReloadMapPart + farcall PlaySpriteAnimations + farcall ReloadMapPart jr .loop .quit - callba ClearSpriteAnims + farcall ClearSpriteAnims call ClearBGPalettes call ClearScreen call ClearSprites @@ -6945,7 +6945,7 @@ Jumptable_117728: ; 117728 (45:7728) Function117738: ; 117738 (45:7738) - callba Function171ccd + farcall Function171ccd depixel 6, 3 ld a, $1d call _InitSpriteAnimStruct @@ -7004,7 +7004,7 @@ Function117764: ; 117764 (45:7764) ret Function117764_select: ; 1177a5 (45:77a5) - callba Function171cf0 + farcall Function171cf0 ret Function117764_start: ; 1177ac (45:77ac) @@ -7176,7 +7176,7 @@ Function1178aa: ; 1178aa (45:78aa) call LoadMenuDataHeader call MenuBox call MenuBoxCoord2Tile - callba ReloadMapPart + farcall ReloadMapPart hlcoord 16, 8 ld de, YessNoString_1179c5 call PlaceString @@ -7278,7 +7278,7 @@ Function117984: ; 117984 (45:7984) call LoadMenuDataHeader call MenuBox call MenuBoxCoord2Tile - callba ReloadMapPart + farcall ReloadMapPart hlcoord 1, 14 ld de, NotAPokemonPasswordString call PlaceString @@ -7379,8 +7379,8 @@ Function117a94: ; 0x117a94 ld [wcf66], a call ClearBGPalettes call ClearSprites - callba Function172e78 - callba HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall Function172e78 + farcall HDMATransferAttrMapAndTileMapToWRAMBank3 ret ; 0x117ab4 @@ -7388,9 +7388,9 @@ Function117a94: ; 0x117a94 Function117ab4: ; 0x117ab4 call ClearBGPalettes call ClearSprites - callba Function172e78 - callba Function172eb9 - callba ReloadMapPart + farcall Function172e78 + farcall Function172eb9 + farcall ReloadMapPart ret ; 0x117acd @@ -7401,7 +7401,7 @@ Function117acd: ; 0x117acd bit 7, a jr nz, .asm_117ae2 call Function117ae9 - callba HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrMapAndTileMapToWRAMBank3 jr Function117acd .asm_117ae2 @@ -7431,7 +7431,7 @@ Function117ae9: ; 0x117ae9 dw Function117c4a Function117b06: - callba Function172eb9 + farcall Function172eb9 ld a, $10 ld [wcf64], a jp MobileStudium_JumptableIncrement @@ -7508,13 +7508,13 @@ Function117b4f: jr nz, .b_button call ExitMenu call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart jp MobileStudium_JumptableIncrement .b_button call ExitMenu call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ld a, $80 ld [wJumptableIndex], a ret @@ -7523,7 +7523,7 @@ Function117bb6: call Function117c89 ld a, $1 ld [hBGMapMode], a - callba Function118284 + farcall Function118284 call ClearSprites ld a, [wc300] and a @@ -7533,7 +7533,7 @@ Function117bb6: .asm_117bd0 ld a, $2 ld [wc303], a - callba DisplayMobileError + farcall DisplayMobileError ld a, $80 ld [wJumptableIndex], a ret @@ -7580,7 +7580,7 @@ Function117bb6: .asm_117c20 pop af ld [rSVBK], a - callba Function172eb9 + farcall Function172eb9 ld a, [rSVBK] push af ld a, $3 @@ -7601,7 +7601,7 @@ Function117c4a: call LoadMenuDataHeader call MenuBox call MenuBoxCoord2Tile - callba ReloadMapPart + farcall ReloadMapPart ld hl, MobileStadiumSuccessText call PrintText ld a, [rSVBK] diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm index 8493a3cf8..e2382fc38 100755 --- a/mobile/mobile_45_sprite_engine.asm +++ b/mobile/mobile_45_sprite_engine.asm @@ -491,7 +491,7 @@ Function1161d5: ; 1161d5 pop af ld [rSVBK], a - callba ReloadMapPart + farcall ReloadMapPart ld a, $8 ld [MusicFade], a ld de, MUSIC_MOBILE_ADAPTER @@ -515,7 +515,7 @@ MenuDataHeader_11628c: ; 11628c ; 116294 Function116294: ; 116294 - callba Function170d02 + farcall Function170d02 ld a, [$c319] inc a ld [$c319], a @@ -541,7 +541,7 @@ Function116294: ; 116294 ; 1162cb Function1162cb: ; 1162cb - callba Function170cc6 + farcall Function170cc6 ld a, [$c319] inc a ld [$c319], a @@ -676,7 +676,7 @@ Function11636e: ; 11636e call UpdateSprites pop af ld [rSVBK], a - callba ReloadMapPart + farcall ReloadMapPart ld a, $8 ld [MusicFade], a ld a, [wMapMusic] @@ -700,7 +700,7 @@ Function1163c0: ; 1163c0 ld bc, 16 * 4 call ByteFill call DelayFrame - callba Function14146 + farcall Function14146 ld b, SCGB_MAPPALS call GetSGBLayout ld a, [rSVBK] @@ -718,10 +718,10 @@ Function1163c0: ; 1163c0 ld a, $90 ld [hWY], a call UpdateSprites - callba Function14157 + farcall Function14157 pop af ld [rSVBK], a - callba ReloadMapPart + farcall ReloadMapPart ld a, [wLinkMode] cp $4 jr z, .asm_11642a @@ -750,10 +750,10 @@ Function1163c0: ; 1163c0 ; 116441 Function116441: ; 116441 - callba Function17d405 + farcall Function17d405 ld a, $90 ld [hWY], a - callba ReloadMapPart + farcall ReloadMapPart ld a, $8 ld [MusicFade], a ld a, [wMapMusic] diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 19b255c34..6e0aed218 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -33,8 +33,8 @@ asm_11800b .skip call Function1184a5 call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -74,8 +74,8 @@ Function11805f: ; 11805f .asm_118090 call Function11857c call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -120,8 +120,8 @@ Function1180b8: ; 1180b8 .asm_1180f2 call Function1184ec call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -165,8 +165,8 @@ Function118125: ; 118125 .skip call BattleTowerRoomMenu_Jumptable call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -203,12 +203,12 @@ Function118180: ; 118180 ld de, w3_d202 ld c, $96 - callba CheckStringForErrors_IgnoreTerminator + farcall CheckStringForErrors_IgnoreTerminator jr c, .return_d3 ld de, w3_d202 lb bc, 1, $96 - callba CheckStringContainsLessThanBNextCharacters + farcall CheckStringContainsLessThanBNextCharacters jr c, .return_d3 ld hl, w3_d202 @@ -254,8 +254,8 @@ Function1181da: ; 1181da .asm_11820b call Function1185c3 call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -292,8 +292,8 @@ Function118233: ; 118233 .asm_11825f call Function118624 call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -328,8 +328,8 @@ Function118284: ; 118284 .asm_1182b0 call Function1186f5 call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -366,8 +366,8 @@ Function1182d5: ; 1182d5 .asm_118301 call Function118746 call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -404,8 +404,8 @@ Function118329: ; 118329 .asm_118355 call Function118671 call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -441,8 +441,8 @@ Function11837a: ; 11837a .asm_1183a6 call Function1186b2 call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -487,10 +487,10 @@ BattleTowerRoomMenu_InitRAM: ; 1183cb ld [hMobileReceive], a ld [hMobile], a ei - callba MobileFunc_106462 - callba Function106464 - callba Function115d99 - callba Function11615a + farcall MobileFunc_106462 + farcall Function106464 + farcall Function115d99 + farcall Function11615a ld a, $5 call GetSRAMBank xor a @@ -1154,7 +1154,7 @@ Function118903: ; 118903 (46:4903) ld a, [wc3f0] ld [$c319], a ld c, $1 - callba Function115e18 + farcall Function115e18 ld a, $8 ld [wcd3c], a call BattleTowerRoomMenu2 @@ -1583,8 +1583,8 @@ Function118d35: ; 118d35 ld a, b ld [$b2fb], a call CloseSRAM - callba Function170be4 - callba Function1700c4 + farcall Function170be4 + farcall Function1700c4 jr .asm_118d78 .asm_118d6e @@ -1673,7 +1673,7 @@ Function118ded: ; 118ded push af ld a, $1 ld [rSVBK], a - callba Function11b93b + farcall Function11b93b pop af ld [rSVBK], a @@ -3259,7 +3259,7 @@ Function119800: ; 119800 ld a, $1 ld [rSVBK], a call FadeToMenu - callba Function10803d + farcall Function10803d call Function11a9ce call RestartMapMusic ld a, $3 @@ -3272,7 +3272,7 @@ Function119800: ; 119800 ld [wcf64], a pop af ld [wJumptableIndex], a - callba Function115dc3 + farcall Function115dc3 jp BattleTowerRoomMenu_IncrementJumptable ; 11984e @@ -3283,7 +3283,7 @@ Function11984e: ; 11984e ld a, [wcd38] and a jr nz, .asm_1198a8 - callba Function170000 + farcall Function170000 ld a, [wJumptableIndex] push af ld a, [wcf64] @@ -3295,7 +3295,7 @@ Function11984e: ; 11984e ld a, $1 ld [rSVBK], a call FadeToMenu - callba MobileTradeAnimation_SendGivemonToGTS + farcall MobileTradeAnimation_SendGivemonToGTS call Function11a9ce call RestartMapMusic ld a, $3 @@ -3308,7 +3308,7 @@ Function11984e: ; 11984e ld [wcf64], a pop af ld [wJumptableIndex], a - callba Function115dc3 + farcall Function115dc3 jp BattleTowerRoomMenu_IncrementJumptable .asm_1198a0 @@ -3317,7 +3317,7 @@ Function11984e: ; 11984e jp BattleTowerRoomMenu_IncrementJumptable .asm_1198a8 - callba Function17005a + farcall Function17005a ld a, [wJumptableIndex] push af ld a, [wcf64] @@ -3329,7 +3329,7 @@ Function11984e: ; 11984e ld a, $1 ld [rSVBK], a call FadeToMenu - callba MobileTradeAnimation_RetrieveGivemonFromGTS + farcall MobileTradeAnimation_RetrieveGivemonFromGTS call Function11a9ce call RestartMapMusic ld a, $3 @@ -3342,7 +3342,7 @@ Function11984e: ; 11984e ld [wcf64], a pop af ld [wJumptableIndex], a - callba Function115dc3 + farcall Function115dc3 jp BattleTowerRoomMenu_IncrementJumptable ; 1198ee @@ -3386,7 +3386,7 @@ Function1198f7: ; 119937 Function119937: ; 119937 - callba Function1707f4 + farcall Function1707f4 jp BattleTowerRoomMenu_IncrementJumptable ; 119940 @@ -4366,8 +4366,8 @@ Function119f98: ; 119f98 and a jr z, .asm_119fd4 call ExitMenu - callba ReloadMapPart - callba Function115dc3 + farcall ReloadMapPart + farcall Function115dc3 ld a, [wcd33] ld [wcf66], a ld a, $a @@ -4383,17 +4383,17 @@ Function119f98: ; 119f98 ld [wc30d], a ld a, $1 ld [wc314], a - callba ReloadMapPart + farcall ReloadMapPart and a ret .asm_119fef call ExitMenu call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ld a, [wMobileInactivityTimerSeconds] ld [wcf66], a - callba Function115dc3 + farcall Function115dc3 ld a, $a ld [wc300], a scf @@ -4434,7 +4434,7 @@ Function11a00e: ; 11a00e ld a, $1 ld [rSVBK], a call FadeToMenu - callba Function11765d + farcall Function11765d call Function11a9ce ld a, $3 ld [rSVBK], a @@ -4444,9 +4444,9 @@ Function11a00e: ; 11a00e call CopyBytes ld a, $1 ld [rSVBK], a - callba Function115d99 + farcall Function115d99 ld c, $0 - callba Function115e18 + farcall Function115e18 ld a, $1 ld [wc305], a ret @@ -4460,15 +4460,15 @@ Function11a00e: ; 11a00e ld a, $5 ld [wMenuBorderBottomCoord], a call PushWindow - callba Function11765d - callba Function117ab4 - callba MobileFunc_106462 - callba Function106464 + farcall Function11765d + farcall Function117ab4 + farcall MobileFunc_106462 + farcall Function106464 call ExitMenu - callba ReloadMapPart - callba Function115d99 + farcall ReloadMapPart + farcall Function115d99 ld c, $0 - callba Function115e18 + farcall Function115e18 ld a, $1 ld [wc305], a ret @@ -4483,15 +4483,15 @@ Function11a0ca: ; 11a0ca ld a, $11 ld [wMenuBorderBottomCoord], a call PushWindow - callba Function11765d - callba Function17d3f6 - callba MobileFunc_106462 - callba Function106464 + farcall Function11765d + farcall Function17d3f6 + farcall MobileFunc_106462 + farcall Function106464 call ExitMenu - callba ReloadMapPart - callba Function115d99 + farcall ReloadMapPart + farcall Function115d99 ld c, $0 - callba Function115e18 + farcall Function115e18 ld a, $1 ld [wc305], a ret @@ -4500,7 +4500,7 @@ Function11a0ca: ; 11a0ca Function11a113: ; 11a113 call Function11a63c ld c, $1 - callba Function115e18 + farcall Function115e18 hlcoord 4, 2 ld de, String_11a6c8 call PlaceString @@ -4580,7 +4580,7 @@ Function11a192: ; 11a192 and a jr nz, .asm_11a1b6 call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart call Function11a63c hlcoord 4, 2 ld de, String_11a6d2 @@ -4590,7 +4590,7 @@ Function11a192: ; 11a192 .asm_11a1b6 call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ld a, [wMobileInactivityTimerSeconds] ld [wcf66], a ld [wcd80], a @@ -4721,7 +4721,7 @@ BattleTowerRoomMenu2_UpdateYesNoMenu: ; 11a235 and a jr nz, .exit_no_carry call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ld a, [wMobileInactivityTimerFrames] cp $0 jr z, .asm_11a2b4 @@ -4743,7 +4743,7 @@ BattleTowerRoomMenu2_UpdateYesNoMenu: ; 11a235 .exit_no_carry call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart and a ret ; 11a2cf @@ -4775,7 +4775,7 @@ MenuDataHeader_11a2de: ; 11a2de Function11a2e6: ; 11a2e6 call Function11a63c ld c, $2 - callba Function115e18 + farcall Function115e18 hlcoord 4, 2 ld de, String_11a71e call PlaceString @@ -4822,8 +4822,8 @@ Function11a33a: ; 11a33a .asm_11a346 call ExitMenu - callba ReloadMapPart - callba Function115dc3 + farcall ReloadMapPart + farcall Function115dc3 and a ret ; 11a357 @@ -4866,7 +4866,7 @@ Function11a38d: ; 11a38d and a jr nz, .asm_11a3b1 call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart call Function11a63c hlcoord 4, 2 ld de, String_11a6d2 @@ -4876,7 +4876,7 @@ Function11a38d: ; 11a38d .asm_11a3b1 call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ld a, [wMobileInactivityTimerSeconds] ld [wcf66], a ld [wcd80], a @@ -4941,7 +4941,7 @@ Function11a41b: ; 11a41b and a jr nz, .asm_11a43f call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart call Function11a63c hlcoord 4, 2 ld de, String_11a6d2 @@ -4951,7 +4951,7 @@ Function11a41b: ; 11a41b .asm_11a43f call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ld a, $1c ld [wcf66], a ld [wcd80], a @@ -5012,7 +5012,7 @@ Function11a49e: ; 11a49e and a jr nz, .asm_11a4c7 call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart call Function11a63c hlcoord 4, 2 ld de, String_11a6d2 @@ -5024,7 +5024,7 @@ Function11a49e: ; 11a49e .asm_11a4c7 call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ld a, [wMobileInactivityTimerFrames] ld [wcf66], a ld [wcd80], a @@ -5059,7 +5059,7 @@ Function11a4fe: ; 11a4fe and a jr nz, .asm_11a522 call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart call Function11a63c hlcoord 4, 2 ld de, String_11a6d2 @@ -5069,7 +5069,7 @@ Function11a4fe: ; 11a4fe .asm_11a522 call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ld a, [wMobileInactivityTimerSeconds] ld [wcf66], a ld [wcd80], a @@ -5098,7 +5098,7 @@ Function11a536: ; 11a536 call Function11a9f0 jr nz, .asm_11a562 call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart .asm_11a562 scf @@ -5174,10 +5174,10 @@ Function11a5b9: ; 11a5b9 ld b, $4 ld c, $12 call Function3eea - callba ReloadMapPart + farcall ReloadMapPart call UpdateSprites ld c, $0 - callba Function115e18 + farcall Function115e18 ld a, $1 ld [wc305], a ret @@ -5209,7 +5209,7 @@ Function11a5f5: ; 11a5f5 hlcoord 15, 7 ld a, $ed ld [hl], a - callba ReloadMapPart + farcall ReloadMapPart ret ; 11a63c @@ -5578,10 +5578,10 @@ Function11a9ce: ; 11a9ce call ClearBGPalettes call ReloadTilesetAndPalettes call Call_ExitMenu - callba MobileFunc_106462 - callba Function106464 + farcall MobileFunc_106462 + farcall Function106464 call ret_d90 - callba FinishExitMenu + farcall FinishExitMenu call UpdateSprites ret ; 11a9f0 @@ -5733,7 +5733,7 @@ Text_ThisBattleRoomPleaseWait: ; 0x11ac1f Function11ac3e: ; 11ac3e call SpeechTextBox call FadeToMenu - callab ClearSpriteAnims2 + callfar ClearSpriteAnims2 call Function11ac51 call CloseSubmenu ret @@ -5773,8 +5773,8 @@ Function11ac51: ; 11ac51 call Function11ad6e ld a, 30 * 4 ld [wCurrSpriteOAMAddr], a - callba DoNextFrameForAllSprites - callba ReloadMapPart + farcall DoNextFrameForAllSprites + farcall ReloadMapPart jr .loop .asm_11aca8 @@ -5845,7 +5845,7 @@ Function11ad1b: ; 11ad1b call ClearBGPalettes call ClearSprites call ClearTileMap - callba Function17c000 + farcall Function17c000 ld a, [wMenuCursorY] ld [wcd82], a dec a @@ -5872,7 +5872,7 @@ Function11ad1b: ; 11ad1b ld [wcd30], a ld a, $2 ld [wc7d4], a - callba Pokedex_OrderMonsByMode + farcall Pokedex_OrderMonsByMode ret ; 11ad6e @@ -5917,7 +5917,7 @@ Function11ad95: ; 11ad95 hlcoord 10, 10, AttrMap lb bc, 8, 8 call Function11afd6 - callba ReloadMapPart + farcall ReloadMapPart call Function11ad8a ld a, $1 ld [wMenuCursorY], a @@ -5996,7 +5996,7 @@ Function11adc4: .asm_11ae2e call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ret ; 11ae38 @@ -6034,7 +6034,7 @@ Function11ae4e: ; 11ae4e hlcoord 9, 12, AttrMap lb bc, 6, 11 call Function11afd6 - callba ReloadMapPart + farcall ReloadMapPart call Function11ad8a ld a, $1 ld [wMenuCursorY], a @@ -6102,7 +6102,7 @@ Function11ae98: .asm_11aef7 call ExitMenu call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ret ; 11af04 @@ -6125,7 +6125,7 @@ Function11af04: ; 11af04 hlcoord 9, 12, AttrMap lb bc, 6, 11 call Function11afd6 - callba ReloadMapPart + farcall ReloadMapPart call Function11ad8a ld a, $2 ld [wMenuCursorY], a @@ -6193,7 +6193,7 @@ Function11af4e: .asm_11afaa call ExitMenu call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ret ; 11afb7 @@ -6697,7 +6697,7 @@ Function11b242: ; 11b242 call PlaceString xor a ld [MonType], a - callba GetGender + farcall GetGender hlcoord 1, 4 ld a, [CurPartySpecies] ld bc, wcd2f @@ -6771,7 +6771,7 @@ Function11b295: ; 11b295 ld hl, $0003 add hl, bc ld e, [hl] - callba FlyFunction_GetMonIcon + farcall FlyFunction_GetMonIcon hlcoord 4, 14 push hl call GetPokemonName @@ -7335,9 +7335,9 @@ Function11b5c0: ; 11b5c0 ld [CurPartyMon], a xor a ld [wPokemonWithdrawDepositParameter], a - callba RemoveMonFromPartyOrBox - callba Function170807 - callba SaveAfterLinkTrade + farcall RemoveMonFromPartyOrBox + farcall Function170807 + farcall SaveAfterLinkTrade jp Function11ad8a ; 11b5e0 @@ -7425,7 +7425,7 @@ Function11b66d: ; 11b66d jr .asm_11b6b0 .asm_11b691 - callba Function17081d + farcall Function17081d ld a, [ScriptVar] and a jr z, .asm_11b6b0 @@ -7486,63 +7486,63 @@ Function11b6b4: ; 11b6b4 ld de, $c63d ld c, 5 - callba CheckStringForErrors + farcall CheckStringForErrors jr nc, .length_check_OT - callba Mobile_CopyDefaultOTName + farcall Mobile_CopyDefaultOTName .length_check_OT ld de, $c63d lb bc, 1, 5 - callba CheckStringContainsLessThanBNextCharacters + farcall CheckStringContainsLessThanBNextCharacters jr nc, .error_check_nick - callba Mobile_CopyDefaultOTName + farcall Mobile_CopyDefaultOTName .error_check_nick ld de, $c642 ld c, 5 - callba CheckStringForErrors + farcall CheckStringForErrors jr nc, .length_check_nick - callba Mobile_CopyDefaultNickname + farcall Mobile_CopyDefaultNickname .length_check_nick ld de, $c642 lb bc, 1, 5 - callba CheckStringContainsLessThanBNextCharacters + farcall CheckStringContainsLessThanBNextCharacters jr nc, .error_check_mail - callba Mobile_CopyDefaultNickname + farcall Mobile_CopyDefaultNickname .error_check_mail ld de, $c647 ld c, MAIL_MSG_LENGTH + 1 - callba CheckStringForErrors + farcall CheckStringForErrors jr nc, .length_check_mail - callba Mobile_CopyDefaultMail + farcall Mobile_CopyDefaultMail .length_check_mail ld de, $c647 lb bc, 2, MAIL_MSG_LENGTH + 1 - callba CheckStringContainsLessThanBNextCharacters + farcall CheckStringContainsLessThanBNextCharacters jr c, .fix_mail ld a, b cp $2 jr nz, .mail_ok .fix_mail - callba Mobile_CopyDefaultMail + farcall Mobile_CopyDefaultMail .mail_ok ld de, $c668 ld c, $5 - callba CheckStringForErrors + farcall CheckStringForErrors jr nc, .length_check_author - callba Mobile_CopyDefaultMailAuthor + farcall Mobile_CopyDefaultMailAuthor .length_check_author ld de, $c668 lb bc, 1, 5 - callba CheckStringContainsLessThanBNextCharacters + farcall CheckStringContainsLessThanBNextCharacters jr nc, .author_okay - callba Mobile_CopyDefaultMailAuthor + farcall Mobile_CopyDefaultMailAuthor .author_okay ld a, [$c60e] @@ -7608,21 +7608,21 @@ Function11b7e5: ; 11b7e5 ld a, [hl] ld [wOTTrademonDVs + 1], a ld bc, $c60d ; pokemon_data_start - callba GetCaughtGender + farcall GetCaughtGender ld a, c ld [wOTTrademonCaughtData], a call SpeechTextBox call FadeToMenu - callba MobileTradeAnimation_ReceiveGetmonFromGTS - callba Function17d1f1 + farcall MobileTradeAnimation_ReceiveGetmonFromGTS + farcall Function17d1f1 ld a, $1 ld [wForceEvolution], a ld a, $2 ld [wLinkMode], a - callba EvolvePokemon + farcall EvolvePokemon xor a ld [wLinkMode], a - callba SaveAfterLinkTrade + farcall SaveAfterLinkTrade ld a, $5 call GetSRAMBank ld a, $5 @@ -7646,7 +7646,7 @@ Function11b7e5: ; 11b7e5 ; 11b879 Function11b879: ; 11b879 - callba BattleTower_CheckSaveFileExistsAndIsYours + farcall BattleTower_CheckSaveFileExistsAndIsYours ld a, [ScriptVar] and a ret z @@ -7787,7 +7787,7 @@ Function11b93b: ; 11b93b ld a, $c64b / $100 ld [wMobileMonMailPointerBuffer + 1], a call AddMobileMonToParty - callba SaveAfterLinkTrade + farcall SaveAfterLinkTrade ret ; 11b98f @@ -7896,7 +7896,7 @@ AddMobileMonToParty: ; 11b98f ; 11ba38 Function11ba38: ; 11ba38 - callba CheckCurPartyMonFainted + farcall CheckCurPartyMonFainted ret c xor a ld [ScriptVar], a diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm index 041c071b4..08cb86426 100755 --- a/mobile/mobile_5b.asm +++ b/mobile/mobile_5b.asm @@ -15,10 +15,10 @@ Function16c000: ; 16c000 ld [wcfbe], a ; Do stuff call MobileSystemSplashScreen_InitGFX ; Load GFX - callba SetRAMStateForMobile - callba EnableMobile + farcall SetRAMStateForMobile + farcall EnableMobile call .RunJumptable - callba DisableMobile + farcall DisableMobile ; Prevent this routine from running again ; until the next time the syatem is turned on xor a @@ -37,7 +37,7 @@ Function16c000: ; 16c000 ld [wd003], a .loop call DelayFrame - callba Function10635c + farcall Function10635c ld a, [wd002] ld hl, .Jumptable rst JumpTable @@ -192,7 +192,7 @@ MobileSystemSplashScreen_InitGFX: ; 16c108 ld bc, 8 ld a, $5 call FarCopyWRAM - callba ApplyPals + farcall ApplyPals ret ; 16c145 @@ -331,7 +331,7 @@ Function16c943: ; 16c943 ld a, e cp $8 jr nz, .asm_16c969 - callba ApplyPals + farcall ApplyPals call SetPalettes ld a, [rSVBK] push af @@ -361,7 +361,7 @@ Function16ca11: ; 16ca11 ld a, [wd003] and a jr nz, .asm_16ca1d - callba ApplyPals + farcall ApplyPals .asm_16ca1d ld a, [rSVBK] @@ -433,7 +433,7 @@ Function16ca11: ; 16ca11 ld a, e cp $8 jr nz, .asm_16ca28 - callba ApplyPals + farcall ApplyPals call SetPalettes ld a, [rSVBK] push af @@ -686,7 +686,7 @@ Function16cbd1: ; 16cbd1 ld bc, 2 ld a, $5 call FarCopyWRAM - callba ApplyPals + farcall ApplyPals ld a, $1 ld [hCGBPalUpdate], a ret diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index 3294cc3dc..005bb1a1b 100755 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -24,7 +24,7 @@ Function170000: ; 170000 ld a, [hl] ld [wPlayerTrademonID + 1], a ld bc, $c633 - callba GetCaughtGender + farcall GetCaughtGender ld a, c ld [wPlayerTrademonCaughtData], a ld a, [wcd81] @@ -65,7 +65,7 @@ Function17005a: ; 17005a ld a, [hl] ld [wOTTrademonID + 1], a ld bc, $a82c - callba GetCaughtGender + farcall GetCaughtGender ld a, c ld [wOTTrademonCaughtData], a ld a, [wcd81] @@ -324,7 +324,7 @@ Function1719c8: ; 1719c8 (5c:59c8) ret Function1719d6: ; 1719d6 (5c:59d6) - callba BattleTowerRoomMenu_InitRAM + farcall BattleTowerRoomMenu_InitRAM call Function1719ed ld a, [rSVBK] push af @@ -343,9 +343,9 @@ Function1719ed: ; 1719ed (5c:59ed) ld [wcd4b], a call ClearBGPalettes call ClearSprites - callba Function171d2b - callba ReloadMapPart - callba ClearSpriteAnims + farcall Function171d2b + farcall ReloadMapPart + farcall ClearSpriteAnims ret Function171a11: ; 171a11 (5c:5a11) @@ -355,11 +355,11 @@ Function171a11: ; 171a11 (5c:5a11) bit 7, a jr nz, .done call Function171a36 - callba PlaySpriteAnimations - callba ReloadMapPart + farcall PlaySpriteAnimations + farcall ReloadMapPart jr .loop .done - callba ClearSpriteAnims + farcall ClearSpriteAnims call ClearSprites ret @@ -412,7 +412,7 @@ Function171a5d: ; 171a5d (5c:5a5d) push af ld a, $1 ld [rSVBK], a - callba BattleTowerRoomMenu_Cleanup + farcall BattleTowerRoomMenu_Cleanup pop af ld [rSVBK], a ld a, $a @@ -420,7 +420,7 @@ Function171a5d: ; 171a5d (5c:5a5d) ret Function171a95: ; 171a95 (5c:5a95) - callba Function171ccd + farcall Function171ccd hlcoord 2, 8 ld de, String_171aa7 call PlaceString @@ -457,7 +457,7 @@ Function171aec: ; 171aec (5c:5aec) push af ld a, $1 ld [rSVBK], a - callba BattleTowerRoomMenu_Cleanup + farcall BattleTowerRoomMenu_Cleanup pop af ld [rSVBK], a hlcoord 2, 6 @@ -619,7 +619,7 @@ Function171beb: ; 171beb (5c:5beb) call LoadMenuDataHeader call MenuBox call MenuBoxCoord2Tile - callba ReloadMapPart + farcall ReloadMapPart hlcoord 1, 14 ld de, String_171c73 call PlaceString @@ -654,11 +654,11 @@ Function171c41: ; 171c41 (5c:5c41) dec [hl] ret nz call ClearBGPalettes - callba MobileFunc_106462 - callba Function106464 + farcall MobileFunc_106462 + farcall Function106464 ld a, $2 ld [wc303], a - callba DisplayMobileError + farcall DisplayMobileError asm_171c60: ; 171c60 (5c:5c60) ld a, $80 ld [wcd49], a diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm index baf247fe2..c8cae6654 100644 --- a/mobile/mobile_5e.asm +++ b/mobile/mobile_5e.asm @@ -39,12 +39,12 @@ Function17a6a8: ; 17a6a8 (5e:66a8) pop de call Function17a6f5 call Function17aba0 - callba Function106464 + farcall Function106464 call Function17ac0c - callba HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrMapAndTileMapToWRAMBank3 call Function17abcf - callba LoadOW_BGPal7 - callba Function49420 + farcall LoadOW_BGPal7 + farcall Function49420 call SetPalettes call DelayFrame ret @@ -163,11 +163,11 @@ Function17a78f: ; 17a78f (5e:678f) bit 7, [hl] res 7, [hl] jr nz, .asm_17a79f - callba HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTileMapToWRAMBank3 ret .asm_17a79f - callba ReloadMapPart + farcall ReloadMapPart ret ; 17a7a6 (5e:67a6) diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 9b0c5455b..cf779e56a 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -77,7 +77,7 @@ Function17c000: ; 17c000 ld [rVBK], a call EnableLCD - callba ReloadMapPart + farcall ReloadMapPart ret ; 17c083 @@ -290,21 +290,21 @@ Function17d0f3: ; 17d0f3 ld a, [hl] ld [wOTTrademonDVs + 1], a ld bc, $c608 + 5 - callba GetCaughtGender + farcall GetCaughtGender ld a, c ld [wOTTrademonCaughtData], a call SpeechTextBox call FadeToMenu - callba Function10804d - callba Function17d1f1 + farcall Function10804d + farcall Function17d1f1 ld a, $1 ld [wForceEvolution], a ld a, $2 ld [wLinkMode], a - callba EvolvePokemon + farcall EvolvePokemon xor a ld [wLinkMode], a - callba SaveAfterLinkTrade + farcall SaveAfterLinkTrade ld a, $5 call GetSRAMBank ld a, $5 @@ -413,7 +413,7 @@ Function17d1f1: ; 17d1f1 ld bc, PARTYMON_STRUCT_LENGTH call AddNTimes predef GetUnownLetter - callab UpdateUnownDex + callfar UpdateUnownDex ld a, [wFirstUnownSeen] and a jr nz, .asm_17d223 @@ -515,7 +515,7 @@ MenuData2_ChallengeExplanationCancel: ; 17d297 Function17d2b6: ; 17d2b6 call Function17d2c0 - callba Function1181da + farcall Function1181da ret ; 17d2c0 @@ -627,7 +627,7 @@ Function17d370: ; 17d370 call ClearBGPalettes call ClearSprites call ClearScreen - callba ReloadMapPart + farcall ReloadMapPart call DisableLCD ld hl, VTiles1 tile $6e ld de, $c608 @@ -673,7 +673,7 @@ Function17d3f6: ; 17d3f6 call ClearBGPalettes call ClearSprites call ClearScreen - callba ReloadMapPart + farcall ReloadMapPart Function17d405: call DisableLCD @@ -719,7 +719,7 @@ Function17d45a: ; 17d45a bit 7, a jr nz, .asm_17d46f call Function17d474 - callba ReloadMapPart + farcall ReloadMapPart jr .asm_17d45a .asm_17d46f @@ -921,7 +921,7 @@ Function17d48d: ; 17d48d call Function17e451 call Function17e55b call Function17e5af - callba ReloadMapPart + farcall ReloadMapPart jp Function17e438 ; 17d5be @@ -1330,7 +1330,7 @@ Function17d833: ; 17d833 add hl, de ld e, l ld d, h - callba Function11c08f + farcall Function11c08f call Function17e349 ret ; 17d85d @@ -1422,7 +1422,7 @@ Function17d85d: ; 17d85d ld [wcd3b], a xor a ld [wcf66], a - callba Function118329 + farcall Function118329 ld a, [wc300] and a jr z, .asm_17d8fe @@ -1457,7 +1457,7 @@ Function17d902: ; 17d902 jr nz, .asm_17d918 xor a ld [wcf66], a - callba Function11837a + farcall Function11837a ld a, [wc300] and a jr z, .asm_17d936 @@ -1488,7 +1488,7 @@ Function17d93a: ; 17d93a ld [CurPartySpecies], a ld a, [$c70c] ld e, a - callba LoadMonPaletteAsNthBGPal + farcall LoadMonPaletteAsNthBGPal call SetPalettes ld a, [$c708] ld l, a @@ -1500,7 +1500,7 @@ Function17d93a: ; 17d93a add hl, de ld e, l ld d, h - callba HOF_AnimateFrontpic + farcall HOF_AnimateFrontpic pop af ld [rSVBK], a call Function17e349 @@ -1524,7 +1524,7 @@ Function17d98b: ; 17d98b ld [TrainerClass], a ld a, [$c70b] ld e, a - callba LoadTrainerClassPaletteAsNthBGPal + farcall LoadTrainerClassPaletteAsNthBGPal call SetPalettes ld a, [$c708] ld e, a @@ -1532,7 +1532,7 @@ Function17d98b: ; 17d98b ld d, a push de ld de, VTiles2 - callba GetTrainerPic + farcall GetTrainerPic pop hl decoord 0, 0 add hl, de @@ -2340,7 +2340,7 @@ Function17ded9: ; 17ded9 push hl push bc predef TryAddMonToParty - callba SetCaughtData + farcall SetCaughtData pop bc pop hl bit 1, b @@ -2378,7 +2378,7 @@ Function17ded9: ; 17ded9 ld a, [hli] ld b, a push hl - callba SetGiftPartyMonCaughtData + farcall SetGiftPartyMonCaughtData pop hl pop bc jr .asm_17df5e @@ -2444,7 +2444,7 @@ Function17ded9: ; 17ded9 ld e, l push hl ld b, $0 - callba CalcPkmnStats + farcall CalcPkmnStats ld a, [PartyCount] dec a ld hl, PartyMon1HP @@ -2532,9 +2532,9 @@ Function17e026: ; 17e026 jp z, .asm_17e0ea push bc push hl - callba LoadEnemyMon - callba SentPkmnIntoBox - callba SetBoxMonCaughtData + farcall LoadEnemyMon + farcall SentPkmnIntoBox + farcall SetBoxMonCaughtData pop hl pop bc ld a, BANK(sBoxMonNicknames) @@ -2563,7 +2563,7 @@ Function17e026: ; 17e026 ld b, a push hl call CloseSRAM - callba SetGiftBoxMonCaughtData + farcall SetGiftBoxMonCaughtData ld a, $1 call GetSRAMBank pop hl @@ -2702,7 +2702,7 @@ Function17e133: ; 17e133 ld a, [hli] ld [ScriptVar], a push hl - callba MobileCheckOwnMonAnywhere + farcall MobileCheckOwnMonAnywhere pop hl jr c, .asm_17e159 inc hl @@ -2950,7 +2950,7 @@ Function17e2a7: ; 17e2a7 call Function17e32b xor a ld [wcf66], a - callba Function118233 + farcall Function118233 ld de, GFX_17eb7e ld hl, VTiles2 tile $60 lb bc, BANK(GFX_17eb7e), 1 @@ -2999,7 +2999,7 @@ Function17e309: ; 17e309 call ClearScreen call Function17e349 call Function17d5f6 - callba DisplayMobileError + farcall DisplayMobileError call Function17e349 call Function17dcaf xor a @@ -3042,7 +3042,7 @@ Function17e367: ; 17e367 push af ld a, $1 ld [rSVBK], a - callba SaveGameData_ + farcall SaveGameData_ pop af ld [rSVBK], a ret @@ -3055,7 +3055,7 @@ Function17e37e: ; 17e37e push af ld a, $1 ld [rSVBK], a - callba SaveAfterLinkTrade + farcall SaveAfterLinkTrade pop af ld [rSVBK], a ret @@ -3068,7 +3068,7 @@ Function17e395: ; 17e395 push af ld a, $1 ld [rSVBK], a - callba SaveBox + farcall SaveBox pop af ld [rSVBK], a ret @@ -3081,7 +3081,7 @@ Function17e3ac: ; 17e3ac push af ld a, $1 ld [rSVBK], a - callba SaveChecksum + farcall SaveChecksum pop af ld [rSVBK], a ret @@ -3094,8 +3094,8 @@ Function17e3c3: ; 17e3c3 push af ld a, $1 ld [rSVBK], a - callba UpdateTrainerRankingsChecksum2 - callba BackupMobileEventIndex + farcall UpdateTrainerRankingsChecksum2 + farcall BackupMobileEventIndex pop af ld [rSVBK], a ret @@ -3947,7 +3947,7 @@ Function17f154: ; 17f154 ld c, l ld b, h pop de - callba Function11c08f + farcall Function11c08f ld c, l ld b, h pop de @@ -3995,7 +3995,7 @@ Function17f181: ; 17f181 ld a, [hl] ld c, a ld de, $c608 - callba Function48c63 + farcall Function48c63 pop hl ld de, $c608 call PlaceString @@ -4279,7 +4279,7 @@ Function17f334: ; 17f334 ld c, a call CloseSRAM ld de, $c608 - callba Function48c63 + farcall Function48c63 pop hl ld de, $c608 call PlaceString @@ -4346,7 +4346,7 @@ Function17f3c9: ; 17f3c9 call CopyBytes pop de ld c, $0 - callba Function11c075 + farcall Function11c075 push hl ld hl, $c708 ld de, wcd36 @@ -4643,7 +4643,7 @@ DisplayMobileError: ; 17f555 ld a, [wc303] bit 7, a jr nz, .quit - callba HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrMapAndTileMapToWRAMBank3 jr .loop .quit @@ -4704,7 +4704,7 @@ DisplayMobileError: ; 17f555 Function17f5c3: ; 17f5c3 call Function17f5e4 - callba FinishExitMenu + farcall FinishExitMenu ld a, $1 ld [wc303], a ret @@ -4712,7 +4712,7 @@ Function17f5c3: ; 17f5c3 Function17f5d2: ; 17f5d2 call Function17f5e4 - callba HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrMapAndTileMapToWRAMBank3 call SetPalettes ld a, $1 ld [wc303], a diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index 6a4e6cf61..468d77fff 100755 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -172,7 +172,7 @@ Function4a098: ; 4a098 (12:6098) call PlaceHollowCursor call WaitBGMap call LoadStandardMenuDataHeader - callba Function89de0 + farcall Function89de0 call Call_ExitMenu call MG_Mobile_Layout_LoadPals call Function4a485 @@ -195,7 +195,7 @@ Function4a0c2: ; 4a0c2 (12:60c2) ld bc, NAME_LENGTH_JAPANESE call CopyBytes call CloseSRAM - callba _LoadData + farcall _LoadData ld c, 2 call DelayFrames ld c, $1 @@ -205,7 +205,7 @@ Function4a0c2: ; 4a0c2 (12:60c2) pop af and a jr nz, .skip_save - callba _SaveData + farcall _SaveData .skip_save ld c, 5 call DelayFrames @@ -280,7 +280,7 @@ Function4a149: ; 4a149 (12:6149) call ClearBox hlcoord 1, 14 call PlaceString - callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap call SetPalettes call StaticMenuJoypad ld hl, wMenuCursorY @@ -347,7 +347,7 @@ String_4a1ef: ; 4a1ef Function4a20e: ; 4a20e (12:620e) ld a, $1 call MenuClickSound - callba Function1719c8 + farcall Function1719c8 call ClearBGPalettes call DelayFrame jr Function4a239 @@ -403,7 +403,7 @@ Function4a28a: ; 4a28a (12:628a) hlcoord 14, 1 ld de, String_4a34b call PlaceString - callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap call Function4a118 call ScrollingMenuJoypad push af @@ -417,7 +417,7 @@ Function4a28a: ; 4a28a (12:628a) cp $3 jr z, .quit .asm_4a2df - callba Function11765d + farcall Function11765d call ClearBGPalettes call Call_ExitMenu call LoadFontsExtra @@ -432,7 +432,7 @@ Function4a28a: ; 4a28a (12:628a) ld b, 3 ld c, 4 call TextBox - callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap ld hl, DeletePassword_YesNo_MenuDataHeader call LoadMenuDataHeader call VerticalMenu @@ -455,7 +455,7 @@ Function4a28a: ; 4a28a (12:628a) call ExitMenu .quit call Call_ExitMenu - callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap xor a ret ; 4a346 (12:6346) @@ -649,7 +649,7 @@ MainMenu_MobileStudium: ; 4a496 ld e, a push bc push de - callba MobileStudium + farcall MobileStudium call ClearBGPalettes pop de pop bc @@ -847,7 +847,7 @@ Function4a6ab: ; 4a6ab (12:66ab) call ClearBGPalettes ld b, SCGB_DIPLOMA call GetSGBLayout - callba Function11c1ab + farcall Function11c1ab pop bc call LoadFontsExtra jp Function4a4c4 diff --git a/mobile/print_opp_message.asm b/mobile/print_opp_message.asm index 0be18acae..612a1b78d 100644 --- a/mobile/print_opp_message.asm +++ b/mobile/print_opp_message.asm @@ -20,7 +20,7 @@ Mobile_PrintOpponentBattleMessage: ; 4ea0a ld bc, wMobileOpponentBattleMessage decoord 1, 14 - callba PrintEZChatBattleMessage + farcall PrintEZChatBattleMessage pop af ld [rSVBK], a From 10a1e6c860f3ab1ec3ebfd74fdd5979613f5d04b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 24 Dec 2017 12:52:05 -0500 Subject: [PATCH 2/7] Support old one-argument sound_duty macro, similar to callab/callba legacy support --- macros/scripts/audio.asm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm index 3766785ba..83ff44963 100644 --- a/macros/scripts/audio.asm +++ b/macros/scripts/audio.asm @@ -72,7 +72,11 @@ soundinput: macro enum sound_duty_cmd ; $de sound_duty: macro db sound_duty_cmd + if _NARG == 4 db \1 | (\2 << 2) | (\3 << 4) | (\4 << 6) ; duty sequence + else + db \1 ; one-byte duty value for legacy support + endc endm enum togglesfx_cmd ; $df From 20d6c1d876cde19061c458761c7283163e316d8a Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 24 Dec 2017 13:08:38 -0500 Subject: [PATCH 3/7] Rename "map permissions" to "map environment" (fix #396) --- constants/map_constants.asm | 19 ++++++++++++++++--- constants/trainer_constants.asm | 14 +++++++------- data/maps/outdoor_sprites.asm | 2 +- engine/battle_transition.asm | 4 ++-- engine/color.asm | 6 +++--- engine/events_2.asm | 2 +- engine/events_3.asm | 2 +- engine/map_setup.asm | 4 ++-- engine/overworld.asm | 4 ++-- engine/phone/phone.asm | 2 +- engine/sgb_layouts.asm | 4 ++-- engine/variables.asm | 2 +- engine/warp_connection.asm | 8 ++++---- event/magnet_train.asm | 6 +++--- event/overworld.asm | 8 ++++---- home/flag.asm | 2 +- home/map.asm | 32 ++++++++++++++++---------------- maps/map_headers.asm | 2 +- tilesets/special_palettes.asm | 2 +- wram.asm | 2 +- 20 files changed, 70 insertions(+), 57 deletions(-) diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 22b02f1c1..d38fcfaba 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -3,17 +3,30 @@ MAP_N_A EQU -1 GROUP_NONE EQU 0 MAP_NONE EQU 0 -; map permissions (wPermission) +; map header fields (see maps/map_headers.asm) + const_def + const MAPHEADER_MAPHEADER2_BANK ; 0 + const MAPHEADER_TILESET ; 1 + const MAPHEADER_ENVIRONMENT ; 2 + const MAPHEADER_MAPHEADER2 ; 3 + const MAPHEADER_MAPHEADER2_HI ; 4 + const MAPHEADER_LOCATION ; 5 + const MAPHEADER_MUSIC ; 6 + const MAPHEADER_PALETTE ; 7 + const MAPHEADER_FISHGROUP ; 8 +NUM_MAPHEADER_ATTRIBUTES EQU const_value + +; map environments (wEnvironment) const_value SET 1 const TOWN const ROUTE const INDOOR const CAVE - const PERM_5 + const ENVIRONMENT_5 const GATE const DUNGEON -; map palettes (wPermission) +; map palettes (wEnvironment) const_def const PALETTE_AUTO const PALETTE_DAY diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index f2fb72714..c41a6ed58 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -680,13 +680,13 @@ NUM_TRAINER_CLASSES EQU __enum__ ; TrainerClassAttributes fields (see data/trainers/trainer_attributes.asm) const_def - const TRNATTR_ITEM1 - const TRNATTR_ITEM2 - const TRNATTR_BASEMONEY - const TRNATTR_AI_MOVE_WEIGHTS - const TRNATTR_AI2 - const TRNATTR_AI_ITEM_SWITCH - const TRNATTR_AI4 + const TRNATTR_ITEM1 ; 0 + const TRNATTR_ITEM2 ; 1 + const TRNATTR_BASEMONEY ; 2 + const TRNATTR_AI_MOVE_WEIGHTS ; 3 + const TRNATTR_AI2 ; 4 + const TRNATTR_AI_ITEM_SWITCH ; 5 + const TRNATTR_AI4 ; 6 NUM_TRAINER_ATTRIBUTES EQU const_value ; TRNATTR_AI_MOVE_WEIGHTS bit flags (wEnemyTrainerAIFlags) diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm index 2b0cd89fe..8064a63e9 100644 --- a/data/maps/outdoor_sprites.asm +++ b/data/maps/outdoor_sprites.asm @@ -1,5 +1,5 @@ ; Valid sprite IDs for each map group. -; Maps with permission ROUTE or TOWN can only use these sprites. +; Maps with environment ROUTE or TOWN can only use these sprites. OutdoorSprites: ; 144b8 dw OlivineGroupSprites diff --git a/engine/battle_transition.asm b/engine/battle_transition.asm index 194f7998b..2af113ddd 100644 --- a/engine/battle_transition.asm +++ b/engine/battle_transition.asm @@ -208,10 +208,10 @@ StartTrainerBattle_DetermineWhichAnimation: ; 8c365 (23:4365) jr nc, .okay set 0, e .okay - ld a, [wPermission] + ld a, [wEnvironment] cp CAVE jr z, .okay2 - cp PERM_5 + cp ENVIRONMENT_5 jr z, .okay2 cp DUNGEON jr z, .okay2 diff --git a/engine/color.asm b/engine/color.asm index e360f101d..ce9e1dfaa 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -1310,7 +1310,7 @@ LoadMapPals: jr c, .got_pals ; Which palette group is based on whether we're outside or inside - ld a, [wPermission] + ld a, [wEnvironment] and 7 ld e, a ld d, 0 @@ -1377,7 +1377,7 @@ LoadMapPals: ld a, BANK(UnknOBPals) call FarCopyWRAM - ld a, [wPermission] + ld a, [wEnvironment] cp TOWN jr z, .outside cp ROUTE @@ -1411,7 +1411,7 @@ endr dw .OutdoorColors ; ROUTE dw .IndoorColors ; INDOOR dw .DungeonColors ; CAVE - dw .Perm5Colors ; PERM_5 + dw .Perm5Colors ; ENVIRONMENT_5 dw .IndoorColors ; GATE dw .DungeonColors ; DUNGEON diff --git a/engine/events_2.asm b/engine/events_2.asm index 6a2a79013..dfa3babdd 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -152,7 +152,7 @@ CanUseSweetScent:: ; 97cfd ld hl, StatusFlags bit 5, [hl] jr nz, .no - ld a, [wPermission] + ld a, [wEnvironment] cp CAVE jr z, .ice_check cp DUNGEON diff --git a/engine/events_3.asm b/engine/events_3.asm index 1b4a4f233..873c511ae 100755 --- a/engine/events_3.asm +++ b/engine/events_3.asm @@ -18,7 +18,7 @@ ReturnFromMapSetupScript:: ; b8000 call .CheckNationalParkGate jr z, .nationalparkgate - call GetMapPermission + call GetMapEnvironment cp GATE jr nz, .not_gate diff --git a/engine/map_setup.asm b/engine/map_setup.asm index 6360178e1..01f3d05d7 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -362,10 +362,10 @@ CheckReplaceKrisSprite: ; 154f7 jr z, .surfing cp PLAYER_SURF_PIKA jr z, .surfing - call GetMapPermission + call GetMapEnvironment cp INDOOR jr z, .checkbiking - cp PERM_5 + cp ENVIRONMENT_5 jr z, .checkbiking cp DUNGEON jr z, .checkbiking diff --git a/engine/overworld.asm b/engine/overworld.asm index 523021c32..a505ecd66 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -112,7 +112,7 @@ GetPlayerSprite: ; 14183 AddMapSprites: ; 141c9 - call GetMapPermission + call GetMapEnvironment call CheckOutdoorMap jr z, .outdoor call AddIndoorSprites @@ -179,7 +179,7 @@ MapCallbackSprites_LoadUsedSpritesGFX: ; 14209 ld c, EMOTE_SHADOW farcall LoadEmote - call GetMapPermission + call GetMapEnvironment call CheckOutdoorMap ld c, EMOTE_GRASS_RUSTLE jr z, .outdoor diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index e49d73c1a..9b451d04a 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -308,7 +308,7 @@ CheckSpecialPhoneCall:: ; 90136 (24:4136) ret SpecialCallOnlyWhenOutside: ; 90188 - ld a, [wPermission] + ld a, [wEnvironment] cp TOWN jr z, .outside cp ROUTE diff --git a/engine/sgb_layouts.asm b/engine/sgb_layouts.asm index e59fb19d8..36dbde84c 100644 --- a/engine/sgb_layouts.asm +++ b/engine/sgb_layouts.asm @@ -562,14 +562,14 @@ endr ret .morn_day - ld a, [wPermission] + ld a, [wEnvironment] cp ROUTE jr z, .route cp CAVE jr z, .cave cp DUNGEON jr z, .cave - cp PERM_5 + cp ENVIRONMENT_5 jr z, .perm5 cp GATE jr z, .gate diff --git a/engine/variables.asm b/engine/variables.asm index edc12ac66..1b418ea3c 100755 --- a/engine/variables.asm +++ b/engine/variables.asm @@ -53,7 +53,7 @@ _GetVarAction:: ; 80648 (20:4648) dwb MapGroup, RETVAR_STRBUF2 dwb MapNumber, RETVAR_STRBUF2 dwb .UnownCaught, RETVAR_EXECUTE - dwb wPermission, RETVAR_STRBUF2 + dwb wEnvironment, RETVAR_STRBUF2 dwb .BoxFreeSpace, RETVAR_EXECUTE dwb wBugContestMinsRemaining, RETVAR_STRBUF2 dwb XCoord, RETVAR_STRBUF2 diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm index 6dec2ec78..e442aec8e 100755 --- a/engine/warp_connection.asm +++ b/engine/warp_connection.asm @@ -164,14 +164,14 @@ LoadWarpData: ; 1046c6 ret .SaveDigWarp: ; 1046df (41:46df) - call GetMapPermission + call GetMapEnvironment call CheckOutdoorMap ret nz ld a, [wNextMapGroup] ld b, a ld a, [wNextMapNumber] ld c, a - call GetAnyMapPermission + call GetAnyMapEnvironment call CheckIndoorMap ret nz ld a, [wPrevMapGroup] @@ -192,14 +192,14 @@ LoadWarpData: ; 1046c6 ret .SetSpawn: ; 104718 (41:4718) - call GetMapPermission + call GetMapEnvironment call CheckOutdoorMap ret nz ld a, [wNextMapGroup] ld b, a ld a, [wNextMapNumber] ld c, a - call GetAnyMapPermission + call GetAnyMapEnvironment call CheckIndoorMap ret nz ld a, [wNextMapGroup] diff --git a/event/magnet_train.asm b/event/magnet_train.asm index 567e0392e..3a2f902c2 100755 --- a/event/magnet_train.asm +++ b/event/magnet_train.asm @@ -434,13 +434,13 @@ MagnetTrain_Jumptable_FirstRunThrough: ; 8ceae ld [rSVBK], a ld a, [TimeOfDayPal] push af - ld a, [wPermission] + ld a, [wEnvironment] push af ld a, [TimeOfDay] and $3 ld [TimeOfDayPal], a ld a, $1 - ld [wPermission], a + ld [wEnvironment], a ld b, SCGB_MAPPALS call GetSGBLayout call UpdateTimePals @@ -451,7 +451,7 @@ MagnetTrain_Jumptable_FirstRunThrough: ; 8ceae ld a, [rOBP1] ld [wOBP1], a pop af - ld [wPermission], a + ld [wEnvironment], a pop af ld [TimeOfDayPal], a pop af diff --git a/event/overworld.asm b/event/overworld.asm index eff2702b2..584617e27 100755 --- a/event/overworld.asm +++ b/event/overworld.asm @@ -571,7 +571,7 @@ FlyFunction: ; ca3b ld de, ENGINE_STORMBADGE call CheckBadge jr c, .nostormbadge - call GetMapPermission + call GetMapEnvironment call CheckOutdoorMap jr z, .outdoors jr .indoors @@ -783,7 +783,7 @@ dig_incave dw .FailDig .CheckCanDig: ; cbb8 - call GetMapPermission + call GetMapEnvironment cp CAVE jr z, .incave cp DUNGEON @@ -905,7 +905,7 @@ TeleportFunction: ; cc61 dw .FailTeleport .TryTeleport: ; cc78 - call GetMapPermission + call GetMapEnvironment call CheckOutdoorMap jr z, .CheckIfSpawnPoint jr .nope @@ -1714,7 +1714,7 @@ BikeFunction: ; d0b3 ret .CheckEnvironment: ; d121 - call GetMapPermission + call GetMapEnvironment call CheckOutdoorMap jr z, .ok cp CAVE diff --git a/home/flag.asm b/home/flag.asm index ddd3eb235..442c811c2 100644 --- a/home/flag.asm +++ b/home/flag.asm @@ -14,7 +14,7 @@ ResetBikeFlags:: ; 2e56 ; 2e5d ResetFlashIfOutOfCave:: ; 2e5d - ld a, [wPermission] + ld a, [wEnvironment] cp $2 jr z, .asm_2e69 cp $1 diff --git a/home/map.asm b/home/map.asm index 11f3fdf83..4171bf9f3 100644 --- a/home/map.asm +++ b/home/map.asm @@ -389,7 +389,7 @@ CheckIndoorMap:: ; 22f4 ret z cp GATE ret z - cp PERM_5 + cp ENVIRONMENT_5 ret ; 2309 @@ -2154,7 +2154,7 @@ GetMapBank:: ; 2c29 GetAnyMapBank:: ; 2c31 push hl push de - ld de, 0 + ld de, MAPHEADER_MAPHEADER2_BANK call GetAnyMapHeaderMember ld a, c pop de @@ -2163,7 +2163,7 @@ GetAnyMapBank:: ; 2c31 ; 2c3d PartiallyCopyMapHeader:: ; 2c3d -; Copy second map header bank, tileset, permission, and second map header address +; Copy second map header bank, tileset, environment, and second map header address ; from the current map's map header. ld a, [hROMBank] push af @@ -2198,18 +2198,18 @@ GetAnyMapBlockdataBank:: ; 2c5b push bc push bc - ld de, 3 ; second map header pointer + ld de, MAPHEADER_MAPHEADER2 call GetAnyMapHeaderMember ld l, c ld h, b pop bc push hl - ld de, 0 ; second map header bank + ld de, MAPHEADER_MAPHEADER2_BANK call GetAnyMapHeaderMember pop hl - ld de, 3 ; blockdata bank + ld de, MAPHEADER_MAPHEADER2 ; blockdata bank add hl, de ld a, c call GetFarByte @@ -2225,7 +2225,7 @@ GetSecondaryMapHeaderPointer:: ; 0x2c7d ; returns the current map's secondary map header pointer in hl. push bc push de - ld de, 3 ; secondary map header pointer (offset within header) + ld de, MAPHEADER_MAPHEADER2 call GetMapHeaderMember ld l, c ld h, b @@ -2234,11 +2234,11 @@ GetSecondaryMapHeaderPointer:: ; 0x2c7d ret ; 2c8a -GetMapPermission:: ; 2c8a +GetMapEnvironment:: ; 2c8a push hl push de push bc - ld de, 2 ; permission + ld de, MAPHEADER_ENVIRONMENT call GetMapHeaderMember ld a, c pop bc @@ -2250,11 +2250,11 @@ GetMapPermission:: ; 2c8a ret ; XXX ; 2c99 -GetAnyMapPermission:: ; 2c99 +GetAnyMapEnvironment:: ; 2c99 push hl push de push bc - ld de, 2 ; permission + ld de, MAPHEADER_ENVIRONMENT call GetAnyMapHeaderMember ld a, c pop bc @@ -2264,7 +2264,7 @@ GetAnyMapPermission:: ; 2c99 ; 2ca7 GetAnyMapTileset:: ; 2ca7 - ld de, 1 ; tileset + ld de, MAPHEADER_TILESET call GetAnyMapHeaderMember ld a, c ret @@ -2276,7 +2276,7 @@ GetWorldMapLocation:: ; 0x2caf push de push bc - ld de, 5 ; landmark + ld de, MAPHEADER_LOCATION call GetAnyMapHeaderMember ld a, c @@ -2289,7 +2289,7 @@ GetWorldMapLocation:: ; 0x2caf GetMapHeaderMusic:: ; 2cbd push hl push bc - ld de, 6 ; music + ld de, MAPHEADER_MUSIC call GetMapHeaderMember ld a, c cp MUSIC_MAHOGANY_MART @@ -2348,7 +2348,7 @@ GetPhoneServiceTimeOfDayByte:: ; 2d0d push hl push bc - ld de, 7 ; phone service and time of day + ld de, MAPHEADER_PALETTE call GetMapHeaderMember ld a, c @@ -2362,7 +2362,7 @@ GetFishingGroup:: ; 2d19 push hl push bc - ld de, 8 ; fishing group + ld de, MAPHEADER_FISHGROUP call GetMapHeaderMember ld a, c diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 3b2607e31..1ea1ba8ce 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -1,7 +1,7 @@ map_header: macro ;\1: map label ;\2: tileset: a TILESET_* constant -;\3: permission: TOWN, ROUTE, INDOOR, CAVE, PERM_5, GATE, or DUNGEON +;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON ;\4: location: from constants/landmark_constants.asm ;\5: music: a MUSIC_* constant ;\6: phone service flag: 1 to prevent phone calls diff --git a/tilesets/special_palettes.asm b/tilesets/special_palettes.asm index 4e83c7390..5674d9f80 100644 --- a/tilesets/special_palettes.asm +++ b/tilesets/special_palettes.asm @@ -25,7 +25,7 @@ LoadSpecialMapPalette: ; 494ac ret .ice_path - ld a, [wPermission] ; permission + ld a, [wEnvironment] and $7 cp INDOOR ; Hall of Fame jr z, .do_nothing diff --git a/wram.asm b/wram.asm index b9bae0e3e..a586413b1 100644 --- a/wram.asm +++ b/wram.asm @@ -1935,7 +1935,7 @@ wMetatileStandingX:: db ; d197 wSecondMapHeaderBank:: db ; d198 wTileset:: db ; d199 -wPermission:: db ; d19a +wEnvironment:: db ; d19a wSecondMapHeaderAddr:: dw ; d19b ; width/height are in blocks (2x2 walkable tiles, 4x4 graphics tiles) From c05b7f41dd5783315e9e4032b63ca84c6ed05893 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 24 Dec 2017 13:46:34 -0500 Subject: [PATCH 4/7] =?UTF-8?q?Renaming:=20(fix=20#412)=20-=20MapTriggers?= =?UTF-8?q?=20/=20maptrigger=20=E2=86=92=20SceneScripts=20/=20scene=5Fscri?= =?UTF-8?q?pt=20-=20XYTriggers=20/=20xy=5Ftrigger=20=E2=86=92=20CoordEvent?= =?UTF-8?q?s=20/=20coord=5Fevent=20-=20Signposts=20/=20signpost=20?= =?UTF-8?q?=E2=86=92=20BGEvents=20/=20bg=5Fevent=20-=20PersonEvents=20/=20?= =?UTF-8?q?person=5Fevent=20=E2=86=92=20ObjectEvents=20/=20object=5Fevent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/event_flags.asm | 4 +- constants/map_constants.asm | 36 ++-- constants/sprite_data_constants.asm | 38 ++-- data/engine_flags.asm | 2 +- data/map_objects.asm | 76 +++---- data/maps/map_scenes.asm | 89 ++++++++ data/maps/map_triggers.asm | 89 -------- docs/event_commands.md | 4 +- docs/map_scripts.md | 38 ++-- docs/movement_commands.md | 6 +- engine/events.asm | 54 ++--- engine/events_2.asm | 4 +- engine/events_3.asm | 30 +-- engine/map_object_action.asm | 4 +- engine/map_objects.asm | 70 +++---- engine/movement.asm | 40 ++-- engine/npc_movement.asm | 12 +- engine/player_object.asm | 10 +- engine/scripting.asm | 122 +++++------ engine/std_scripts.asm | 6 +- engine/trainer_scripts.asm | 4 +- engine/warp_connection.asm | 2 +- event/bug_contest/judging.asm | 32 +-- event/overworld.asm | 4 +- event/std_collision.asm | 2 +- home.asm | 4 +- home/map.asm | 144 ++++++------- home/map_objects.asm | 6 +- home/movement.asm | 2 +- macros/scripts/event.asm | 74 +++---- macros/scripts/maps.asm | 28 +-- macros/scripts/movement.asm | 18 +- macros/wram.asm | 2 +- main.asm | 2 +- maps/AzaleaGym.asm | 30 +-- maps/AzaleaMart.asm | 14 +- maps/AzaleaPokecenter1F.asm | 20 +- maps/AzaleaTown.asm | 80 +++---- maps/BattleTower1F.asm | 44 ++-- maps/BattleTowerBattleRoom.asm | 20 +- maps/BattleTowerElevator.asm | 20 +- maps/BattleTowerHallway.asm | 22 +- maps/BattleTowerOutside.asm | 18 +- maps/BillsHouse.asm | 10 +- maps/BlackthornCity.asm | 40 ++-- maps/BlackthornDragonSpeechHouse.asm | 12 +- maps/BlackthornEmysHouse.asm | 14 +- maps/BlackthornGym1F.asm | 22 +- maps/BlackthornGym2F.asm | 24 +-- maps/BlackthornMart.asm | 14 +- maps/BlackthornPokecenter1F.asm | 16 +- maps/BluesHouse.asm | 10 +- maps/BrunosRoom.asm | 18 +- maps/BurnedTower1F.asm | 42 ++-- maps/BurnedTowerB1F.asm | 44 ++-- maps/CeladonCafe.asm | 22 +- maps/CeladonCity.asm | 42 ++-- maps/CeladonDeptStore1F.asm | 18 +- maps/CeladonDeptStore2F.asm | 20 +- maps/CeladonDeptStore3F.asm | 22 +- maps/CeladonDeptStore4F.asm | 18 +- maps/CeladonDeptStore5F.asm | 22 +- maps/CeladonDeptStore6F.asm | 24 +-- maps/CeladonDeptStoreElevator.asm | 10 +- maps/CeladonGameCorner.asm | 102 ++++----- maps/CeladonGameCornerPrizeRoom.asm | 16 +- maps/CeladonGym.asm | 24 +-- maps/CeladonMansion1F.asm | 22 +- maps/CeladonMansion2F.asm | 14 +- maps/CeladonMansion3F.asm | 24 +-- maps/CeladonMansionRoof.asm | 12 +- maps/CeladonMansionRoofHouse.asm | 10 +- maps/CeladonPokecenter1F.asm | 18 +- maps/CeladonPokecenter2FBeta.asm | 8 +- maps/CeruleanCity.asm | 38 ++-- maps/CeruleanGym.asm | 38 ++-- maps/CeruleanGymBadgeSpeechHouse.asm | 10 +- maps/CeruleanMart.asm | 14 +- maps/CeruleanPokecenter1F.asm | 14 +- maps/CeruleanPokecenter2FBeta.asm | 8 +- maps/CeruleanPoliceStation.asm | 14 +- maps/CeruleanTradeSpeechHouse.asm | 16 +- maps/CharcoalKiln.asm | 20 +- maps/CherrygroveCity.asm | 46 ++-- maps/CherrygroveEvolutionSpeechHouse.asm | 16 +- maps/CherrygroveGymSpeechHouse.asm | 16 +- maps/CherrygroveMart.asm | 14 +- maps/CherrygrovePokecenter1F.asm | 16 +- maps/CianwoodCity.asm | 62 +++--- maps/CianwoodCityPhotoStudio.asm | 10 +- maps/CianwoodGym.asm | 34 +-- maps/CianwoodLugiaSpeechHouse.asm | 18 +- maps/CianwoodPharmacy.asm | 18 +- maps/CianwoodPokecenter1F.asm | 16 +- maps/CinnabarIsland.asm | 18 +- maps/CinnabarPokecenter1F.asm | 14 +- maps/CinnabarPokecenter2FBeta.asm | 8 +- maps/Colosseum.asm | 32 +-- maps/CopycatsHouse1F.asm | 14 +- maps/CopycatsHouse2F.asm | 24 +-- maps/DanceTheatre.asm | 30 +-- maps/DarkCaveBlackthornEntrance.asm | 14 +- maps/DarkCaveVioletEntrance.asm | 26 +-- maps/DayCare.asm | 16 +- maps/DiglettsCave.asm | 12 +- maps/DragonShrine.asm | 26 +-- maps/DragonsDen1F.asm | 8 +- maps/DragonsDenB1F.asm | 48 ++--- maps/EarlsPokemonAcademy.asm | 28 +-- maps/EcruteakCity.asm | 38 ++-- maps/EcruteakGym.asm | 38 ++-- maps/EcruteakHouse.asm | 46 ++-- maps/EcruteakItemfinderHouse.asm | 14 +- maps/EcruteakLugiaSpeechHouse.asm | 14 +- maps/EcruteakMart.asm | 14 +- maps/EcruteakPokecenter1F.asm | 26 +-- maps/ElmsHouse.asm | 18 +- maps/ElmsLab.asm | 110 +++++----- maps/FastShip1F.asm | 46 ++-- maps/FastShipB1F.asm | 50 ++--- maps/FastShipCabins_NNW_NNE_NE.asm | 30 +-- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 38 ++-- maps/FastShipCabins_SW_SSW_NW.asm | 22 +- maps/FightingDojo.asm | 16 +- maps/FuchsiaBillSpeechHouse.asm | 12 +- maps/FuchsiaCity.asm | 32 +-- maps/FuchsiaGym.asm | 24 +-- maps/FuchsiaMart.asm | 14 +- maps/FuchsiaPokecenter1F.asm | 20 +- maps/FuchsiaPokecenter2FBeta.asm | 8 +- maps/GoldenrodBikeShop.asm | 28 +-- maps/GoldenrodBillsHouse.asm | 20 +- maps/GoldenrodCity.asm | 62 +++--- maps/GoldenrodDeptStore1F.asm | 20 +- maps/GoldenrodDeptStore2F.asm | 22 +- maps/GoldenrodDeptStore3F.asm | 18 +- maps/GoldenrodDeptStore4F.asm | 20 +- maps/GoldenrodDeptStore5F.asm | 24 +-- maps/GoldenrodDeptStore6F.asm | 24 +-- maps/GoldenrodDeptStoreB1F.asm | 24 +-- maps/GoldenrodDeptStoreElevator.asm | 10 +- maps/GoldenrodDeptStoreRoof.asm | 32 +-- maps/GoldenrodFlowerShop.asm | 12 +- maps/GoldenrodGameCorner.asm | 94 ++++----- maps/GoldenrodGym.asm | 42 ++-- maps/GoldenrodHappinessRater.asm | 20 +- maps/GoldenrodMagnetTrainStation.asm | 18 +- maps/GoldenrodNameRater.asm | 16 +- maps/GoldenrodPPSpeechHouse.asm | 18 +- maps/GoldenrodPokeComCenter2FMobile.asm | 20 +- maps/GoldenrodPokecenter1F.asm | 30 +-- maps/GuideGentsHouse.asm | 14 +- maps/HallOfFame.asm | 20 +- maps/IcePath1F.asm | 14 +- maps/IcePathB1F.asm | 20 +- maps/IcePathB2FBlackthornSide.asm | 12 +- maps/IcePathB2FMahoganySide.asm | 22 +- maps/IcePathB3F.asm | 12 +- maps/IlexForest.asm | 104 +++++----- maps/IlexForestAzaleaGate.asm | 12 +- maps/IndigoPlateauPokecenter1F.asm | 44 ++-- maps/KarensRoom.asm | 18 +- maps/KogasRoom.asm | 18 +- maps/KrissHouse1F.asm | 42 ++-- maps/KrissHouse2F.asm | 24 +-- maps/KrissNeighborsHouse.asm | 18 +- maps/KurtsHouse.asm | 34 +-- maps/LakeOfRage.asm | 54 ++--- maps/LakeOfRageHiddenPowerHouse.asm | 14 +- maps/LakeOfRageMagikarpHouse.asm | 14 +- maps/LancesRoom.asm | 26 +-- maps/LavRadioTower1F.asm | 22 +- maps/LavenderMart.asm | 14 +- maps/LavenderNameRater.asm | 14 +- maps/LavenderPokecenter1F.asm | 16 +- maps/LavenderPokecenter2FBeta.asm | 8 +- maps/LavenderTown.asm | 28 +-- maps/LavenderTownSpeechHouse.asm | 14 +- maps/MahoganyGym.asm | 30 +-- maps/MahoganyMart1F.asm | 26 +-- maps/MahoganyPokecenter1F.asm | 16 +- maps/MahoganyRedGyaradosSpeechHouse.asm | 12 +- maps/MahoganyTown.asm | 36 ++-- maps/ManiasHouse.asm | 10 +- maps/MobileBattleRoom.asm | 20 +- maps/MobileTradeRoomMobile.asm | 20 +- maps/MountMoon.asm | 18 +- maps/MountMoonGiftShop.asm | 16 +- maps/MountMoonSquare.asm | 24 +-- maps/MountMortar1FInside.asm | 30 +-- maps/MountMortar1FOutside.asm | 14 +- maps/MountMortar2FInside.asm | 24 +-- maps/MountMortarB1F.asm | 24 +-- maps/MoveDeletersHouse.asm | 14 +- maps/MrFujisHouse.asm | 22 +- maps/MrPokemonsHouse.asm | 34 +-- maps/MrPsychicsHouse.asm | 14 +- maps/NationalPark.asm | 44 ++-- maps/NationalParkBugContest.asm | 40 ++-- maps/NewBarkTown.asm | 38 ++-- maps/OaksLab.asm | 50 ++--- maps/OlivineCafe.asm | 14 +- maps/OlivineCity.asm | 46 ++-- maps/OlivineGoodRodHouse.asm | 10 +- maps/OlivineGym.asm | 20 +- maps/OlivineHouseBeta.asm | 16 +- maps/OlivineLighthouse1F.asm | 12 +- maps/OlivineLighthouse2F.asm | 12 +- maps/OlivineLighthouse3F.asm | 16 +- maps/OlivineLighthouse4F.asm | 12 +- maps/OlivineLighthouse5F.asm | 20 +- maps/OlivineLighthouse6F.asm | 14 +- maps/OlivineMart.asm | 14 +- maps/OlivinePokecenter1F.asm | 16 +- maps/OlivinePort.asm | 36 ++-- maps/OlivinePortPassage.asm | 10 +- maps/OlivinePunishmentSpeechHouse.asm | 16 +- maps/OlivineTimsHouse.asm | 14 +- maps/PalletTown.asm | 20 +- maps/PewterCity.asm | 32 +-- maps/PewterGym.asm | 18 +- maps/PewterMart.asm | 14 +- maps/PewterNidoranSpeechHouse.asm | 12 +- maps/PewterPokecenter1F.asm | 18 +- maps/PewterPokecenter2FBeta.asm | 8 +- maps/PewterSnoozeSpeechHouse.asm | 14 +- maps/PokeSeersHouse.asm | 10 +- maps/Pokecenter2F.asm | 70 +++---- maps/PokemonFanClub.asm | 24 +-- maps/PowerPlant.asm | 42 ++-- maps/RadioTower1F.asm | 24 +-- maps/RadioTower2F.asm | 42 ++-- maps/RadioTower3F.asm | 28 +-- maps/RadioTower4F.asm | 26 +-- maps/RadioTower5F.asm | 54 ++--- maps/RedsHouse1F.asm | 20 +- maps/RedsHouse2F.asm | 12 +- maps/RockTunnel1F.asm | 16 +- maps/RockTunnelB1F.asm | 16 +- maps/Route1.asm | 16 +- maps/Route10North.asm | 12 +- maps/Route10Pokecenter1F.asm | 16 +- maps/Route10Pokecenter2FBeta.asm | 8 +- maps/Route10South.asm | 14 +- maps/Route11.asm | 22 +- maps/Route12.asm | 26 +-- maps/Route12SuperRodHouse.asm | 10 +- maps/Route13.asm | 26 +-- maps/Route14.asm | 16 +- maps/Route15.asm | 24 +-- maps/Route15FuchsiaGate.asm | 10 +- maps/Route16.asm | 10 +- maps/Route16FuchsiaSpeechHouse.asm | 14 +- maps/Route16Gate.asm | 18 +- maps/Route17.asm | 20 +- maps/Route1718Gate.asm | 18 +- maps/Route18.asm | 14 +- maps/Route19.asm | 24 +-- maps/Route19FuchsiaGate.asm | 10 +- maps/Route2.asm | 36 ++-- maps/Route20.asm | 16 +- maps/Route21.asm | 14 +- maps/Route22.asm | 10 +- maps/Route23.asm | 10 +- maps/Route24.asm | 10 +- maps/Route25.asm | 50 ++--- maps/Route26.asm | 26 +-- maps/Route26DayofWeekSiblingsHouse.asm | 10 +- maps/Route26HealSpeechHouse.asm | 14 +- maps/Route27.asm | 42 ++-- maps/Route27SandstormHouse.asm | 14 +- maps/Route28.asm | 12 +- maps/Route28FamousSpeechHouse.asm | 20 +- maps/Route29.asm | 48 ++--- maps/Route2946Gate.asm | 12 +- maps/Route2Gate.asm | 10 +- maps/Route2NuggetSpeechHouse.asm | 10 +- maps/Route3.asm | 18 +- maps/Route30.asm | 40 ++-- maps/Route30BerrySpeechHouse.asm | 14 +- maps/Route31.asm | 26 +-- maps/Route31VioletGate.asm | 12 +- maps/Route32.asm | 72 +++---- maps/Route32Pokecenter1F.asm | 14 +- maps/Route32RuinsOfAlphGate.asm | 14 +- maps/Route33.asm | 16 +- maps/Route34.asm | 44 ++-- maps/Route34IlexForestGate.asm | 18 +- maps/Route35.asm | 34 +-- maps/Route35GoldenrodGate.asm | 14 +- maps/Route35NationalParkGate.asm | 30 +-- maps/Route36.asm | 50 ++--- maps/Route36NationalParkGate.asm | 48 ++--- maps/Route36RuinsOfAlphGate.asm | 12 +- maps/Route37.asm | 26 +-- maps/Route38.asm | 26 +-- maps/Route38EcruteakGate.asm | 10 +- maps/Route39.asm | 36 ++-- maps/Route39Barn.asm | 14 +- maps/Route39Farmhouse.asm | 16 +- maps/Route4.asm | 20 +- maps/Route40.asm | 36 ++-- maps/Route40BattleTowerGate.asm | 12 +- maps/Route41.asm | 30 +-- maps/Route42.asm | 50 ++--- maps/Route42EcruteakGate.asm | 10 +- maps/Route43.asm | 34 +-- maps/Route43Gate.asm | 30 +-- maps/Route43MahoganyGate.asm | 10 +- maps/Route44.asm | 36 ++-- maps/Route45.asm | 38 ++-- maps/Route46.asm | 22 +- maps/Route5.asm | 14 +- maps/Route5CleanseTagSpeechHouse.asm | 16 +- maps/Route5SaffronCityGate.asm | 10 +- maps/Route5UndergroundEntrance.asm | 10 +- maps/Route6.asm | 16 +- maps/Route6SaffronGate.asm | 14 +- maps/Route6UndergroundEntrance.asm | 8 +- maps/Route7.asm | 12 +- maps/Route7SaffronGate.asm | 10 +- maps/Route8.asm | 24 +-- maps/Route8SaffronGate.asm | 10 +- maps/Route9.asm | 24 +-- maps/RuinsOfAlphAerodactylChamber.asm | 30 +-- maps/RuinsOfAlphAerodactylItemRoom.asm | 20 +- maps/RuinsOfAlphAerodactylWordRoom.asm | 8 +- maps/RuinsOfAlphHoOhChamber.asm | 30 +-- maps/RuinsOfAlphHoOhItemRoom.asm | 20 +- maps/RuinsOfAlphHoOhWordRoom.asm | 8 +- maps/RuinsOfAlphInnerChamber.asm | 74 +++---- maps/RuinsOfAlphKabutoChamber.asm | 34 +-- maps/RuinsOfAlphKabutoItemRoom.asm | 20 +- maps/RuinsOfAlphKabutoWordRoom.asm | 8 +- maps/RuinsOfAlphOmanyteChamber.asm | 30 +-- maps/RuinsOfAlphOmanyteItemRoom.asm | 20 +- maps/RuinsOfAlphOmanyteWordRoom.asm | 8 +- maps/RuinsOfAlphOutside.asm | 46 ++-- maps/RuinsOfAlphResearchCenter.asm | 32 +-- maps/SafariZoneBeta.asm | 8 +- maps/SafariZoneFuchsiaGateBeta.asm | 8 +- maps/SafariZoneMainOffice.asm | 8 +- maps/SafariZoneWardensHome.asm | 18 +- maps/SaffronCity.asm | 40 ++-- maps/SaffronGym.asm | 22 +- maps/SaffronMart.asm | 14 +- maps/SaffronPokecenter1F.asm | 16 +- maps/SaffronPokecenter2FBeta.asm | 8 +- maps/SaffronTrainStation.asm | 22 +- maps/SeafoamGym.asm | 16 +- maps/SilphCo1F.asm | 12 +- maps/SilverCaveItemRooms.asm | 12 +- maps/SilverCaveOutside.asm | 14 +- maps/SilverCavePokecenter1F.asm | 12 +- maps/SilverCaveRoom1.asm | 20 +- maps/SilverCaveRoom2.asm | 16 +- maps/SilverCaveRoom3.asm | 10 +- maps/SlowpokeWellB1F.asm | 30 +-- maps/SlowpokeWellB2F.asm | 12 +- maps/SoulHouse.asm | 16 +- maps/SproutTower1F.asm | 24 +-- maps/SproutTower2F.asm | 16 +- maps/SproutTower3F.asm | 46 ++-- maps/TeamRocketBaseB1F.asm | 134 ++++++------ maps/TeamRocketBaseB2F.asm | 134 ++++++------ maps/TeamRocketBaseB3F.asm | 82 ++++---- maps/TimeCapsule.asm | 26 +-- maps/TinTower1F.asm | 56 ++--- maps/TinTower2F.asm | 8 +- maps/TinTower3F.asm | 10 +- maps/TinTower4F.asm | 16 +- maps/TinTower5F.asm | 14 +- maps/TinTower6F.asm | 10 +- maps/TinTower7F.asm | 10 +- maps/TinTower8F.asm | 14 +- maps/TinTower9F.asm | 10 +- maps/TinTowerRoof.asm | 10 +- maps/TohjoFalls.asm | 10 +- maps/TradeCenter.asm | 26 +-- maps/TrainerHouse1F.asm | 24 +-- maps/TrainerHouseB1F.asm | 18 +- maps/Underground.asm | 12 +- maps/UndergroundPathSwitchRoomEntrances.asm | 64 +++--- maps/UndergroundWarehouse.asm | 22 +- maps/UnionCave1F.asm | 26 +-- maps/UnionCaveB1F.asm | 22 +- maps/UnionCaveB2F.asm | 20 +- maps/VermilionCity.asm | 36 ++-- maps/VermilionGym.asm | 52 ++--- .../VermilionHouseDiglettsCaveSpeechHouse.asm | 10 +- maps/VermilionHouseFishingSpeechHouse.asm | 12 +- maps/VermilionMagnetTrainSpeechHouse.asm | 16 +- maps/VermilionMart.asm | 14 +- maps/VermilionPokecenter1F.asm | 16 +- maps/VermilionPokecenter2FBeta.asm | 8 +- maps/VermilionPort.asm | 28 +-- maps/VermilionPortPassage.asm | 10 +- maps/VictoryRoad.asm | 42 ++-- maps/VictoryRoadGate.asm | 28 +-- maps/VioletCity.asm | 38 ++-- maps/VioletGym.asm | 26 +-- maps/VioletKylesHouse.asm | 12 +- maps/VioletMart.asm | 14 +- maps/VioletNicknameSpeechHouse.asm | 14 +- maps/VioletPokecenter1F.asm | 20 +- maps/ViridianCity.asm | 28 +-- maps/ViridianGym.asm | 16 +- maps/ViridianMart.asm | 14 +- maps/ViridianNicknameSpeechHouse.asm | 16 +- maps/ViridianPokecenter1F.asm | 16 +- maps/ViridianPokecenter2FBeta.asm | 8 +- maps/WarehouseEntrance.asm | 36 ++-- maps/WhirlIslandB1F.asm | 26 +-- maps/WhirlIslandB2F.asm | 14 +- maps/WhirlIslandCave.asm | 8 +- maps/WhirlIslandLugiaChamber.asm | 10 +- maps/WhirlIslandNE.asm | 10 +- maps/WhirlIslandNW.asm | 8 +- maps/WhirlIslandSE.asm | 8 +- maps/WhirlIslandSW.asm | 10 +- maps/WillsRoom.asm | 18 +- maps/WiseTriosRoom.asm | 32 +-- mobile/battle_tower_5c.asm | 12 +- mobile/mobile_45.asm | 102 ++++----- mobile/mobile_46.asm | 2 +- mobile/mobile_5f.asm | 2 +- wram.asm | 196 +++++++++--------- 427 files changed, 5206 insertions(+), 5206 deletions(-) create mode 100644 data/maps/map_scenes.asm delete mode 100644 data/maps/map_triggers.asm diff --git a/constants/event_flags.asm b/constants/event_flags.asm index d1aa43610..b4c3fc18b 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -130,7 +130,7 @@ const EVENT_GOT_TM12_SWEET_SCENT const EVENT_RELEASED_THE_BEASTS const EVENT_GOT_MASTER_BALL_FROM_ELM -; Johto signpost items +; Johto hidden items const EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION const EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE const EVENT_TIN_TOWER_5F_HIDDEN_CARBOS @@ -236,7 +236,7 @@ const EVENT_TALKED_TO_OAK_IN_KANTO const EVENT_GOT_HP_UP_FROM_VERMILION_GUY const EVENT_GOT_TM29_PSYCHIC -; Kanto signpost items +; Kanto hidden items const EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE const EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE const EVENT_UNDERGROUND_HIDDEN_X_SPECIAL diff --git a/constants/map_constants.asm b/constants/map_constants.asm index d38fcfaba..1af4215a1 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -176,28 +176,28 @@ const_value = -1 NUM_SPAWNS EQU const_value -; TryReadSign arguments (see engine/events.asm) +; TryBGEvent arguments (see engine/events.asm) const_def - const SIGNPOST_READ - const SIGNPOST_UP - const SIGNPOST_DOWN - const SIGNPOST_RIGHT - const SIGNPOST_LEFT - const SIGNPOST_IFSET - const SIGNPOST_IFNOTSET - const SIGNPOST_ITEM - const SIGNPOST_COPY + const BGEVENT_READ + const BGEVENT_UP + const BGEVENT_DOWN + const BGEVENT_RIGHT + const BGEVENT_LEFT + const BGEVENT_IFSET + const BGEVENT_IFNOTSET + const BGEVENT_ITEM + const BGEVENT_COPY -; person_event types +; object_event types ; TryObjectEvent arguments (see engine/events.asm) const_def - const PERSONTYPE_SCRIPT - const PERSONTYPE_ITEMBALL - const PERSONTYPE_TRAINER - const PERSONTYPE_3 - const PERSONTYPE_4 - const PERSONTYPE_5 - const PERSONTYPE_6 + const OBJECTTYPE_SCRIPT + const OBJECTTYPE_ITEMBALL + const OBJECTTYPE_TRAINER + const OBJECTTYPE_3 + const OBJECTTYPE_4 + const OBJECTTYPE_5 + const OBJECTTYPE_6 ; EmotesPointers indexes (see engine/overworld.asm) diff --git a/constants/sprite_data_constants.asm b/constants/sprite_data_constants.asm index 29f88d63d..77d9e3975 100644 --- a/constants/sprite_data_constants.asm +++ b/constants/sprite_data_constants.asm @@ -25,7 +25,7 @@ const_value SET 1 const PAL_OW_TREE ; 6 const PAL_OW_ROCK ; 7 -; person_events set bit 3 so as not to use the sprite's default palette +; object_events set bit 3 so as not to use the sprite's default palette const_value set (1 << 3) const PAL_NPC_RED ; 8 const PAL_NPC_BLUE ; 9 @@ -138,25 +138,25 @@ SPRITEMOVEDATA_FIELDS EQU 6 const STEP_TYPE_18 ; 18 const STEP_TYPE_SKYFALL_TOP ; 19 -; PersonActionPairPointers indexes (see engine/map_object_action.asm) +; ObjectActionPairPointers indexes (see engine/map_object_action.asm) const_def - const PERSON_ACTION_00 ; 00 - const PERSON_ACTION_STAND ; 01 - const PERSON_ACTION_STEP ; 02 - const PERSON_ACTION_BUMP ; 03 - const PERSON_ACTION_SPIN ; 04 - const PERSON_ACTION_SPIN_FLICKER ; 05 - const PERSON_ACTION_FISHING ; 06 - const PERSON_ACTION_SHADOW ; 07 - const PERSON_ACTION_EMOTE ; 08 - const PERSON_ACTION_BIG_SNORLAX ; 09 - const PERSON_ACTION_BOUNCE ; 0a - const PERSON_ACTION_WEIRD_TREE ; 0b - const PERSON_ACTION_BIG_LAPRAS ; 0c - const PERSON_ACTION_BIG_DOLL ; 0d - const PERSON_ACTION_BOULDER_DUST ; 0e - const PERSON_ACTION_GRASS_SHAKE ; 0f - const PERSON_ACTION_SKYFALL ; 10 + const OBJECT_ACTION_00 ; 00 + const OBJECT_ACTION_STAND ; 01 + const OBJECT_ACTION_STEP ; 02 + const OBJECT_ACTION_BUMP ; 03 + const OBJECT_ACTION_SPIN ; 04 + const OBJECT_ACTION_SPIN_FLICKER ; 05 + const OBJECT_ACTION_FISHING ; 06 + const OBJECT_ACTION_SHADOW ; 07 + const OBJECT_ACTION_EMOTE ; 08 + const OBJECT_ACTION_BIG_SNORLAX ; 09 + const OBJECT_ACTION_BOUNCE ; 0a + const OBJECT_ACTION_WEIRD_TREE ; 0b + const OBJECT_ACTION_BIG_LAPRAS ; 0c + const OBJECT_ACTION_BIG_DOLL ; 0d + const OBJECT_ACTION_BOULDER_DUST ; 0e + const OBJECT_ACTION_GRASS_SHAKE ; 0f + const OBJECT_ACTION_SKYFALL ; 10 ; Facings indexes (see data/facings.asm) const_def diff --git a/data/engine_flags.asm b/data/engine_flags.asm index 6eb5f6065..8dfc251c6 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -118,7 +118,7 @@ EngineFlags: ; 80462 engine_flag WeeklyFlags, 0 ; mt moon square clefairy ; $58 engine_flag WeeklyFlags, 1 ; union cave lapras engine_flag WeeklyFlags, 2 ; goldenrod underground haircut used - engine_flag WeeklyFlags, 3 ; goldenrod mall happiness event floor05 person07 + engine_flag WeeklyFlags, 3 ; goldenrod mall happiness event floor05 object07 engine_flag WeeklyFlags, 4 ; tea in blues house engine_flag WeeklyFlags, 5 ; indigo plateau rival fight engine_flag WeeklyFlags, 6 ; move tutor diff --git a/data/map_objects.asm b/data/map_objects.asm index 6bf9aeaa1..09de8dc52 100755 --- a/data/map_objects.asm +++ b/data/map_objects.asm @@ -6,42 +6,42 @@ endm SpriteMovementData:: ; 4273 ; entries correspond to SPRITEMOVEDATA_* constants ; function, facing, action, flags1, flags2, palette flags - sprite_movement_data SPRITEMOVEFN_00, DOWN, PERSON_ACTION_STAND, $02, $00, %0000 ; 00 - sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, PERSON_ACTION_STAND, $0c, $00, %0000 ; 01 - sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 02 - sprite_movement_data SPRITEMOVEFN_SLOW_RANDOM_SPIN, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 03 - sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_Y, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 04 - sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_X, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 05 - sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 06 - sprite_movement_data SPRITEMOVEFN_STANDING, UP, PERSON_ACTION_STAND, $00, $00, %0000 ; 07 - sprite_movement_data SPRITEMOVEFN_STANDING, LEFT, PERSON_ACTION_STAND, $00, $00, %0000 ; 08 - sprite_movement_data SPRITEMOVEFN_STANDING, RIGHT, PERSON_ACTION_STAND, $00, $00, %0000 ; 09 - sprite_movement_data SPRITEMOVEFN_FAST_RANDOM_SPIN, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 0a - sprite_movement_data SPRITEMOVEFN_OBEY_DPAD, DOWN, PERSON_ACTION_STAND, $02, $00, %0000 ; 0b - sprite_movement_data SPRITEMOVEFN_08, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 0c - sprite_movement_data SPRITEMOVEFN_09, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 0d - sprite_movement_data SPRITEMOVEFN_0A, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 0e - sprite_movement_data SPRITEMOVEFN_0B, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 0f - sprite_movement_data SPRITEMOVEFN_0C, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 10 - sprite_movement_data SPRITEMOVEFN_0D, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 11 - sprite_movement_data SPRITEMOVEFN_0E, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 12 - sprite_movement_data SPRITEMOVEFN_FOLLOW, DOWN, PERSON_ACTION_STAND, $02, $00, %0000 ; 13 - sprite_movement_data SPRITEMOVEFN_SCRIPTED, DOWN, PERSON_ACTION_STAND, $02, $00, %0000 ; 14 - sprite_movement_data SPRITEMOVEFN_BIG_SNORLAX, DOWN, PERSON_ACTION_BIG_SNORLAX, $2e, $01, %1100 ; 15 - sprite_movement_data SPRITEMOVEFN_BOUNCE, DOWN, PERSON_ACTION_BOUNCE, $2e, $00, %0000 ; 16 - sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, PERSON_ACTION_STAND, $0c, $00, %0000 ; 17 - sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, PERSON_ACTION_STAND, $2e, $10, %0000 ; 18 - sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, PERSON_ACTION_STAND, $2e, $00, %0100 ; 19 - sprite_movement_data SPRITEMOVEFN_FOLLOWNOTEXACT, DOWN, PERSON_ACTION_STAND, $02, $00, %0000 ; 1a - sprite_movement_data SPRITEMOVEFN_SHADOW, DOWN, PERSON_ACTION_00, $8e, $01, %0000 ; 1b - sprite_movement_data SPRITEMOVEFN_EMOTE, DOWN, PERSON_ACTION_EMOTE, $8e, $02, %0000 ; 1c - sprite_movement_data SPRITEMOVEFN_SCREENSHAKE, DOWN, PERSON_ACTION_00, $82, $00, %0000 ; 1d - sprite_movement_data SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE, LEFT, PERSON_ACTION_STAND, $00, $00, %0000 ; 1e - sprite_movement_data SPRITEMOVEFN_SPIN_CLOCKWISE, RIGHT, PERSON_ACTION_STAND, $00, $00, %0000 ; 1f - sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, PERSON_ACTION_BIG_LAPRAS, $2e, $01, %1100 ; 20 - sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, PERSON_ACTION_BIG_DOLL, $2e, $01, %1100 ; 21 - sprite_movement_data SPRITEMOVEFN_BOULDERDUST, DOWN, PERSON_ACTION_BOULDER_DUST, $8e, $01, %0000 ; 22 - sprite_movement_data SPRITEMOVEFN_GRASS, DOWN, PERSON_ACTION_GRASS_SHAKE, $8e, $02, %0000 ; 23 - sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY, DOWN, PERSON_ACTION_STAND, $00, $00, %0010 ; 24 - sprite_movement_data SPRITEMOVEFN_00, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 25 + sprite_movement_data SPRITEMOVEFN_00, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; 00 + sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, OBJECT_ACTION_STAND, $0c, $00, %0000 ; 01 + sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 02 + sprite_movement_data SPRITEMOVEFN_SLOW_RANDOM_SPIN, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 03 + sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_Y, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 04 + sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_X, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 05 + sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 06 + sprite_movement_data SPRITEMOVEFN_STANDING, UP, OBJECT_ACTION_STAND, $00, $00, %0000 ; 07 + sprite_movement_data SPRITEMOVEFN_STANDING, LEFT, OBJECT_ACTION_STAND, $00, $00, %0000 ; 08 + sprite_movement_data SPRITEMOVEFN_STANDING, RIGHT, OBJECT_ACTION_STAND, $00, $00, %0000 ; 09 + sprite_movement_data SPRITEMOVEFN_FAST_RANDOM_SPIN, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 0a + sprite_movement_data SPRITEMOVEFN_OBEY_DPAD, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; 0b + sprite_movement_data SPRITEMOVEFN_08, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 0c + sprite_movement_data SPRITEMOVEFN_09, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 0d + sprite_movement_data SPRITEMOVEFN_0A, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 0e + sprite_movement_data SPRITEMOVEFN_0B, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 0f + sprite_movement_data SPRITEMOVEFN_0C, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 10 + sprite_movement_data SPRITEMOVEFN_0D, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 11 + sprite_movement_data SPRITEMOVEFN_0E, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 12 + sprite_movement_data SPRITEMOVEFN_FOLLOW, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; 13 + sprite_movement_data SPRITEMOVEFN_SCRIPTED, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; 14 + sprite_movement_data SPRITEMOVEFN_BIG_SNORLAX, DOWN, OBJECT_ACTION_BIG_SNORLAX, $2e, $01, %1100 ; 15 + sprite_movement_data SPRITEMOVEFN_BOUNCE, DOWN, OBJECT_ACTION_BOUNCE, $2e, $00, %0000 ; 16 + sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, OBJECT_ACTION_STAND, $0c, $00, %0000 ; 17 + sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, OBJECT_ACTION_STAND, $2e, $10, %0000 ; 18 + sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, OBJECT_ACTION_STAND, $2e, $00, %0100 ; 19 + sprite_movement_data SPRITEMOVEFN_FOLLOWNOTEXACT, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; 1a + sprite_movement_data SPRITEMOVEFN_SHADOW, DOWN, OBJECT_ACTION_00, $8e, $01, %0000 ; 1b + sprite_movement_data SPRITEMOVEFN_EMOTE, DOWN, OBJECT_ACTION_EMOTE, $8e, $02, %0000 ; 1c + sprite_movement_data SPRITEMOVEFN_SCREENSHAKE, DOWN, OBJECT_ACTION_00, $82, $00, %0000 ; 1d + sprite_movement_data SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE, LEFT, OBJECT_ACTION_STAND, $00, $00, %0000 ; 1e + sprite_movement_data SPRITEMOVEFN_SPIN_CLOCKWISE, RIGHT, OBJECT_ACTION_STAND, $00, $00, %0000 ; 1f + sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, OBJECT_ACTION_BIG_LAPRAS, $2e, $01, %1100 ; 20 + sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, OBJECT_ACTION_BIG_DOLL, $2e, $01, %1100 ; 21 + sprite_movement_data SPRITEMOVEFN_BOULDERDUST, DOWN, OBJECT_ACTION_BOULDER_DUST, $8e, $01, %0000 ; 22 + sprite_movement_data SPRITEMOVEFN_GRASS, DOWN, OBJECT_ACTION_GRASS_SHAKE, $8e, $02, %0000 ; 23 + sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY, DOWN, OBJECT_ACTION_STAND, $00, $00, %0010 ; 24 + sprite_movement_data SPRITEMOVEFN_00, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 25 ; 4357 diff --git a/data/maps/map_scenes.asm b/data/maps/map_scenes.asm new file mode 100644 index 000000000..52d4508be --- /dev/null +++ b/data/maps/map_scenes.asm @@ -0,0 +1,89 @@ +scene_def: MACRO +; db group, map +; dw address + map \1 + dw \2 +ENDM + +MapScenes:: ; 4d01e + scene_def POKECENTER_2F, wPokecenter2FSceneID + scene_def TRADE_CENTER, wTradeCenterSceneID + scene_def COLOSSEUM, wColosseumSceneID + scene_def TIME_CAPSULE, wTimeCapsuleSceneID + scene_def POWER_PLANT, wPowerPlantSceneID + scene_def CERULEAN_GYM, wCeruleanGymSceneID + scene_def ROUTE_25, wRoute25SceneID + scene_def TRAINER_HOUSE_B1F, wTrainerHouseB1FSceneID + scene_def VICTORY_ROAD_GATE, wVictoryRoadGateSceneID + scene_def SAFFRON_TRAIN_STATION, wSaffronTrainStationSceneID + scene_def ROUTE_16_GATE, wRoute16GateSceneID + scene_def ROUTE_17_18_GATE, wRoute1718GateSceneID + scene_def INDIGO_PLATEAU_POKECENTER_1F, wIndigoPlateauPokecenter1FSceneID + scene_def WILLS_ROOM, wWillsRoomSceneID + scene_def KOGAS_ROOM, wKogasRoomSceneID + scene_def BRUNOS_ROOM, wBrunosRoomSceneID + scene_def KARENS_ROOM, wKarensRoomSceneID + scene_def LANCES_ROOM, wLancesRoomSceneID + scene_def HALL_OF_FAME, wHallOfFameSceneID + scene_def ROUTE_27, wRoute27SceneID + scene_def NEW_BARK_TOWN, wNewBarkTownSceneID + scene_def ELMS_LAB, wElmsLabSceneID + scene_def KRISS_HOUSE_1F, wKrissHouse1FSceneID + scene_def ROUTE_29, wRoute29SceneID + scene_def CHERRYGROVE_CITY, wCherrygroveCitySceneID + scene_def MR_POKEMONS_HOUSE, wMrPokemonsHouseSceneID + scene_def ROUTE_32, wRoute32SceneID + scene_def ROUTE_35_NATIONAL_PARK_GATE, wRoute35NationalParkGateSceneID + scene_def ROUTE_36, wRoute36SceneID + scene_def ROUTE_36_NATIONAL_PARK_GATE, wRoute36NationalParkGateSceneID + scene_def AZALEA_TOWN, wAzaleaTownSceneID + scene_def GOLDENROD_GYM, wGoldenrodGymSceneID + scene_def GOLDENROD_MAGNET_TRAIN_STATION, wGoldenrodMagnetTrainStationSceneID + scene_def GOLDENROD_POKECENTER_1F, wGoldenrodPokecenter1FSceneID + scene_def OLIVINE_CITY, wOlivineCitySceneID + scene_def ROUTE_34, wRoute34SceneID + scene_def ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateSceneID + scene_def ECRUTEAK_HOUSE, wEcruteakHouseSceneID + scene_def WISE_TRIOS_ROOM, wWiseTriosRoomSceneID + scene_def ECRUTEAK_POKECENTER_1F, wEcruteakPokecenter1FSceneID + scene_def ECRUTEAK_GYM, wEcruteakGymSceneID + scene_def MAHOGANY_TOWN, wMahoganyTownSceneID + scene_def ROUTE_42, wRoute42SceneID + scene_def CIANWOOD_CITY, wCianwoodCitySceneID + scene_def BATTLE_TOWER_1F, wBattleTower1FSceneID + scene_def BATTLE_TOWER_BATTLE_ROOM, wBattleTowerBattleRoomSceneID + scene_def BATTLE_TOWER_ELEVATOR, wBattleTowerElevatorSceneID + scene_def BATTLE_TOWER_HALLWAY, wBattleTowerHallwaySceneID + scene_def BATTLE_TOWER_OUTSIDE, wBattleTowerOutsideSceneID + scene_def ROUTE_43_GATE, wRoute43GateSceneID + scene_def MOUNT_MOON, wMountMoonSceneID + scene_def SPROUT_TOWER_3F, wSproutTower3FSceneID + scene_def TIN_TOWER_1F, wTinTower1FSceneID + scene_def BURNED_TOWER_1F, wBurnedTower1FSceneID + scene_def BURNED_TOWER_B1F, wBurnedTowerB1FSceneID + scene_def RADIO_TOWER_5F, wRadioTower5FSceneID + scene_def RUINS_OF_ALPH_OUTSIDE, wRuinsOfAlphOutsideSceneID + scene_def RUINS_OF_ALPH_RESEARCH_CENTER, wRuinsOfAlphResearchCenterSceneID + scene_def RUINS_OF_ALPH_HO_OH_CHAMBER, wRuinsOfAlphHoOhChamberSceneID + scene_def RUINS_OF_ALPH_KABUTO_CHAMBER, wRuinsOfAlphKabutoChamberSceneID + scene_def RUINS_OF_ALPH_OMANYTE_CHAMBER, wRuinsOfAlphOmanyteChamberSceneID + scene_def RUINS_OF_ALPH_AERODACTYL_CHAMBER, wRuinsOfAlphAerodactylChamberSceneID + scene_def RUINS_OF_ALPH_INNER_CHAMBER, wRuinsOfAlphInnerChamberSceneID + scene_def MAHOGANY_MART_1F, wMahoganyMart1FSceneID + scene_def TEAM_ROCKET_BASE_B1F, wTeamRocketBaseB1FSceneID + scene_def TEAM_ROCKET_BASE_B2F, wTeamRocketBaseB2FSceneID + scene_def TEAM_ROCKET_BASE_B3F, wTeamRocketBaseB3FSceneID + scene_def UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, wUndergroundPathSwitchRoomEntrancesSceneID + scene_def SILVER_CAVE_ROOM_3, wSilverCaveRoom3SceneID + scene_def VICTORY_ROAD, wVictoryRoadSceneID + scene_def DRAGONS_DEN_B1F, wDragonsDenB1FSceneID + scene_def DRAGON_SHRINE, wDragonShrineSceneID + scene_def OLIVINE_PORT, wOlivinePortSceneID + scene_def VERMILION_PORT, wVermilionPortSceneID + scene_def FAST_SHIP_1F, wFastShip1FSceneID + scene_def FAST_SHIP_B1F, wFastShipB1FSceneID + scene_def MOUNT_MOON_SQUARE, wMountMoonSquareSceneID + scene_def MOBILE_TRADE_ROOM_MOBILE, wMobileTradeRoomMobileSceneID + scene_def MOBILE_BATTLE_ROOM, wMobileBattleRoomSceneID + db -1 +; 4d15b diff --git a/data/maps/map_triggers.asm b/data/maps/map_triggers.asm deleted file mode 100644 index b2ba1222a..000000000 --- a/data/maps/map_triggers.asm +++ /dev/null @@ -1,89 +0,0 @@ -trigger_def: MACRO -; db group, map -; dw address - map \1 - dw \2 -ENDM - -MapTriggers:: ; 4d01e - trigger_def POKECENTER_2F, wPokecenter2FTrigger - trigger_def TRADE_CENTER, wTradeCenterTrigger - trigger_def COLOSSEUM, wColosseumTrigger - trigger_def TIME_CAPSULE, wTimeCapsuleTrigger - trigger_def POWER_PLANT, wPowerPlantTrigger - trigger_def CERULEAN_GYM, wCeruleanGymTrigger - trigger_def ROUTE_25, wRoute25Trigger - trigger_def TRAINER_HOUSE_B1F, wTrainerHouseB1FTrigger - trigger_def VICTORY_ROAD_GATE, wVictoryRoadGateTrigger - trigger_def SAFFRON_TRAIN_STATION, wSaffronTrainStationTrigger - trigger_def ROUTE_16_GATE, wRoute16GateTrigger - trigger_def ROUTE_17_18_GATE, wRoute1718GateTrigger - trigger_def INDIGO_PLATEAU_POKECENTER_1F, wIndigoPlateauPokecenter1FTrigger - trigger_def WILLS_ROOM, wWillsRoomTrigger - trigger_def KOGAS_ROOM, wKogasRoomTrigger - trigger_def BRUNOS_ROOM, wBrunosRoomTrigger - trigger_def KARENS_ROOM, wKarensRoomTrigger - trigger_def LANCES_ROOM, wLancesRoomTrigger - trigger_def HALL_OF_FAME, wHallOfFameTrigger - trigger_def ROUTE_27, wRoute27Trigger - trigger_def NEW_BARK_TOWN, wNewBarkTownTrigger - trigger_def ELMS_LAB, wElmsLabTrigger - trigger_def KRISS_HOUSE_1F, wKrissHouse1FTrigger - trigger_def ROUTE_29, wRoute29Trigger - trigger_def CHERRYGROVE_CITY, wCherrygroveCityTrigger - trigger_def MR_POKEMONS_HOUSE, wMrPokemonsHouseTrigger - trigger_def ROUTE_32, wRoute32Trigger - trigger_def ROUTE_35_NATIONAL_PARK_GATE, wRoute35NationalParkGateTrigger - trigger_def ROUTE_36, wRoute36Trigger - trigger_def ROUTE_36_NATIONAL_PARK_GATE, wRoute36NationalParkGateTrigger - trigger_def AZALEA_TOWN, wAzaleaTownTrigger - trigger_def GOLDENROD_GYM, wGoldenrodGymTrigger - trigger_def GOLDENROD_MAGNET_TRAIN_STATION, wGoldenrodMagnetTrainStationTrigger - trigger_def GOLDENROD_POKECENTER_1F, wGoldenrodPokecenter1FTrigger - trigger_def OLIVINE_CITY, wOlivineCityTrigger - trigger_def ROUTE_34, wRoute34Trigger - trigger_def ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateTrigger - trigger_def ECRUTEAK_HOUSE, wEcruteakHouseTrigger - trigger_def WISE_TRIOS_ROOM, wWiseTriosRoomTrigger - trigger_def ECRUTEAK_POKECENTER_1F, wEcruteakPokecenter1FTrigger - trigger_def ECRUTEAK_GYM, wEcruteakGymTrigger - trigger_def MAHOGANY_TOWN, wMahoganyTownTrigger - trigger_def ROUTE_42, wRoute42Trigger - trigger_def CIANWOOD_CITY, wCianwoodCityTrigger - trigger_def BATTLE_TOWER_1F, wBattleTower1FTrigger - trigger_def BATTLE_TOWER_BATTLE_ROOM, wBattleTowerBattleRoomTrigger - trigger_def BATTLE_TOWER_ELEVATOR, wBattleTowerElevatorTrigger - trigger_def BATTLE_TOWER_HALLWAY, wBattleTowerHallwayTrigger - trigger_def BATTLE_TOWER_OUTSIDE, wBattleTowerOutsideTrigger - trigger_def ROUTE_43_GATE, wRoute43GateTrigger - trigger_def MOUNT_MOON, wMountMoonTrigger - trigger_def SPROUT_TOWER_3F, wSproutTower3FTrigger - trigger_def TIN_TOWER_1F, wTinTower1FTrigger - trigger_def BURNED_TOWER_1F, wBurnedTower1FTrigger - trigger_def BURNED_TOWER_B1F, wBurnedTowerB1FTrigger - trigger_def RADIO_TOWER_5F, wRadioTower5FTrigger - trigger_def RUINS_OF_ALPH_OUTSIDE, wRuinsOfAlphOutsideTrigger - trigger_def RUINS_OF_ALPH_RESEARCH_CENTER, wRuinsOfAlphResearchCenterTrigger - trigger_def RUINS_OF_ALPH_HO_OH_CHAMBER, wRuinsOfAlphHoOhChamberTrigger - trigger_def RUINS_OF_ALPH_KABUTO_CHAMBER, wRuinsOfAlphKabutoChamberTrigger - trigger_def RUINS_OF_ALPH_OMANYTE_CHAMBER, wRuinsOfAlphOmanyteChamberTrigger - trigger_def RUINS_OF_ALPH_AERODACTYL_CHAMBER, wRuinsOfAlphAerodactylChamberTrigger - trigger_def RUINS_OF_ALPH_INNER_CHAMBER, wRuinsOfAlphInnerChamberTrigger - trigger_def MAHOGANY_MART_1F, wMahoganyMart1FTrigger - trigger_def TEAM_ROCKET_BASE_B1F, wTeamRocketBaseB1FTrigger - trigger_def TEAM_ROCKET_BASE_B2F, wTeamRocketBaseB2FTrigger - trigger_def TEAM_ROCKET_BASE_B3F, wTeamRocketBaseB3FTrigger - trigger_def UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, wUndergroundPathSwitchRoomEntrancesTrigger - trigger_def SILVER_CAVE_ROOM_3, wSilverCaveRoom3Trigger - trigger_def VICTORY_ROAD, wVictoryRoadTrigger - trigger_def DRAGONS_DEN_B1F, wDragonsDenB1FTrigger - trigger_def DRAGON_SHRINE, wDragonShrineTrigger - trigger_def OLIVINE_PORT, wOlivinePortTrigger - trigger_def VERMILION_PORT, wVermilionPortTrigger - trigger_def FAST_SHIP_1F, wFastShip1FTrigger - trigger_def FAST_SHIP_B1F, wFastShipB1FTrigger - trigger_def MOUNT_MOON_SQUARE, wMountMoonSquareTrigger - trigger_def MOBILE_TRADE_ROOM_MOBILE, wMobileTradeRoomMobileTrigger - trigger_def MOBILE_BATTLE_ROOM, wMobileBattleRoomTrigger - db -1 -; 4d15b diff --git a/docs/event_commands.md b/docs/event_commands.md index b9bc4a925..4bb8a1711 100644 --- a/docs/event_commands.md +++ b/docs/event_commands.md @@ -39,11 +39,11 @@ Defined in [macros/scripts/event.asm](/macros/scripts/event.asm) and [engine/scr ## `$11`: `checkmaptriggers` *map* -## `$12`: `domaptrigger` *map*, *trigger_id* +## `$12`: `setmapscene` *map*, *scene_id* ## `$13`: `checktriggers` -## `$14`: `dotrigger` *trigger_id* +## `$14`: `setscene` *scene_id* ## `$15`: `writebyte` *value* diff --git a/docs/map_scripts.md b/docs/map_scripts.md index f26de1949..f601616ef 100644 --- a/docs/map_scripts.md +++ b/docs/map_scripts.md @@ -3,15 +3,15 @@ ## `const_value set 2` -- **`const` *`MAPNAME_PERSONNAME`*** +- **`const` *`MAPNAME_OBJECTNAME`*** ## `MapName_MapScriptHeader:` -## `.MapTriggers: db` *N* +## `.SceneScripts: db` *N* -- **`maptrigger` *script*** +- **`scene_script` *script*** ## `.MapCallbacks: db` *N* @@ -63,34 +63,34 @@ Callback types: - **`warp_def` *y*, *x*, *warp_id*, *map*** -## `.XYTriggers: db` *N* +## `.CoordEvents: db` *N* -- **`xy_trigger` *id*, *y*, *x*, `$0`, *script*, `$0`, `$0`** +- **`coord_event` *id*, *y*, *x*, `$0`, *script*, `$0`, `$0`** -## `.Signposts: db` *N* +## `.BGEvents: db` *N* -- **`signpost` *y*, *x*, *type*, *script*** +- **`bg_event` *y*, *x*, *type*, *script*** -Signpost types: +BG event types: -- **`SIGNPOST_READ`** +- **`BGEVENT_READ`** -- **`SIGNPOST_UP/DOWN/LEFT/RIGHT`** +- **`BGEVENT_UP/DOWN/LEFT/RIGHT`** -- **`SIGNPOST_IFSET/IFNOTSET`** +- **`BGEVENT_IFSET/IFNOTSET`** **`dw` *event_flag*, *script*** -- **`SIGNPOST_ITEM`** +- **`BGEVENT_ITEM`** **`dwb` *event_flag*, *item_id*** -- **`SIGNPOST_COPY`** +- **`BGEVENT_COPY`** -## `.PersonEvents: db` *N* +## `.ObjectEvents: db` *N* -- **`person_event` *sprite*, *y*, *x*, *movement*, *ry*, *rx*, *hour*, *daytime*, *palette*, *type*, *range*, *script*, *event_flag*** +- **`object_event` *sprite*, *y*, *x*, *movement*, *ry*, *rx*, *hour*, *daytime*, *palette*, *type*, *range*, *script*, *event_flag*** Movement types: @@ -126,14 +126,14 @@ Movement types: - **`SPRITEMOVEDATA_LAPRAS`** -Person types: +Object types: -- **`PERSONTYPE_SCRIPT`** +- **`OBJECTTYPE_SCRIPT`** -- **`PERSONTYPE_ITEMBALL`** +- **`OBJECTTYPE_ITEMBALL`** **`itemball` *item_id*** -- **`PERSONTYPE_TRAINER`** +- **`OBJECTTYPE_TRAINER`** **`trainer` *event_flag*, *group_id*, *trainer_id*, *seen_text*, *beaten_text*, *loss_text*, *script*** diff --git a/docs/movement_commands.md b/docs/movement_commands.md index db86fd2f9..56b55f53e 100644 --- a/docs/movement_commands.md +++ b/docs/movement_commands.md @@ -39,9 +39,9 @@ Defined in [macros/scripts/movement.asm](/macros/scripts/movement.asm) and [engi ## `$3B`: `fix_facing` -## `$3C`: `show_person` +## `$3C`: `show_object` -## `$3D`: `hide_person` +## `$3D`: `hide_object` ## `$3E`−`$46`: `step_sleep` *length* @@ -49,7 +49,7 @@ Defined in [macros/scripts/movement.asm](/macros/scripts/movement.asm) and [engi ## `$48`: `step_48` *param* -## `$49`: `remove_person` +## `$49`: `remove_object` ## `$4A`: `step_loop` diff --git a/engine/events.asm b/engine/events.asm index d8e4883ae..9b26893e7 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -286,7 +286,7 @@ PlayerEvents: ; 9681f call RunMemScript jr c, .ok - call DoMapTrigger + call RunSceneScript jr c, .ok call CheckTimeEvents @@ -335,7 +335,7 @@ CheckTrainerBattle3: ; 96867 ; 96874 CheckTileEvent: ; 96874 -; Check for warps, tile triggers or wild battles. +; Check for warps, coord events, or wild battles. call CheckWarpConnxnScriptFlag jr z, .connections_disabled @@ -350,7 +350,7 @@ CheckTileEvent: ; 96874 call CheckCoordEventScriptFlag jr z, .coord_events_disabled - call CheckCurrentMapXYTriggers + call CheckCurrentMapCoordEvents jr c, .coord_event .coord_events_disabled @@ -437,19 +437,19 @@ Dummy_CheckScriptFlags3Bit5: ; 968e4 ret ; 968ec -DoMapTrigger: ; 968ec - ld a, [wCurrMapTriggerCount] +RunSceneScript: ; 968ec + ld a, [wCurrMapSceneScriptCount] and a jr z, .nope ld c, a - call CheckTriggers + call CheckScenes cp c jr nc, .nope ld e, a ld d, 0 - ld hl, wCurrMapTriggerHeaderPointer + ld hl, wCurrMapSceneScriptHeaderPointer ld a, [hli] ld h, [hl] ld l, a @@ -559,9 +559,9 @@ CheckAPressOW: ; 96999 ret z call TryObjectEvent ret c - call TryReadSign + call TryBGEvent ret c - call CheckFacingTileEvent + call TryTileCollisionEvent ret c xor a ret @@ -617,14 +617,14 @@ TryObjectEvent: ; 969b5 ret .pointers - dbw PERSONTYPE_SCRIPT, .script - dbw PERSONTYPE_ITEMBALL, .itemball - dbw PERSONTYPE_TRAINER, .trainer + dbw OBJECTTYPE_SCRIPT, .script + dbw OBJECTTYPE_ITEMBALL, .itemball + dbw OBJECTTYPE_TRAINER, .trainer ; the remaining four are dummy events - dbw PERSONTYPE_3, .three - dbw PERSONTYPE_4, .four - dbw PERSONTYPE_5, .five - dbw PERSONTYPE_6, .six + dbw OBJECTTYPE_3, .three + dbw OBJECTTYPE_4, .four + dbw OBJECTTYPE_5, .five + dbw OBJECTTYPE_6, .six db -1 ; 96a04 @@ -681,19 +681,19 @@ TryObjectEvent: ; 969b5 ret ; 96a38 -TryReadSign: ; 96a38 - call CheckFacingSign - jr c, .IsSign +TryBGEvent: ; 96a38 + call CheckFacingBGEvent + jr c, .is_bg_event xor a ret -.IsSign: +.is_bg_event: ld a, [EngineBuffer3] - ld hl, .signs + ld hl, .bg_events rst JumpTable ret -.signs +.bg_events dw .read dw .up dw .down @@ -736,7 +736,7 @@ TryReadSign: ; 96a38 ret .itemifset - call CheckSignFlag + call CheckBGEventFlag jp nz, .dontread call PlayTalkObject call GetMapScriptHeaderBank @@ -750,7 +750,7 @@ TryReadSign: ; 96a38 ret .copy - call CheckSignFlag + call CheckBGEventFlag jr nz, .dontread call GetMapScriptHeaderBank ld de, EngineBuffer1 @@ -759,12 +759,12 @@ TryReadSign: ; 96a38 jr .dontread .ifset - call CheckSignFlag + call CheckBGEventFlag jr z, .dontread jr .thenread .ifnotset - call CheckSignFlag + call CheckBGEventFlag jr nz, .dontread .thenread @@ -785,7 +785,7 @@ TryReadSign: ; 96a38 ret ; 96ad8 -CheckSignFlag: ; 96ad8 +CheckBGEventFlag: ; 96ad8 ld hl, EngineBuffer4 ld a, [hli] ld h, [hl] diff --git a/engine/events_2.asm b/engine/events_2.asm index dfa3babdd..12476bd31 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -50,11 +50,11 @@ LoadScriptBDE:: ; 97c4f ret ; 97c5f -CheckFacingTileEvent:: ; 97c5f +TryTileCollisionEvent:: ; 97c5f call GetFacingTileCoord ld [EngineBuffer1], a ld c, a - farcall CheckFacingTileForStd + farcall CheckFacingTileForStdScript jr c, .done call CheckCutTreeTile diff --git a/engine/events_3.asm b/engine/events_3.asm index 873c511ae..eb6154f60 100755 --- a/engine/events_3.asm +++ b/engine/events_3.asm @@ -283,30 +283,30 @@ CheckForHiddenItems: ; b8172 ld a, [YCoord] add SCREEN_HEIGHT / 4 ld [Buffer3], a -; Get the pointer for the first signpost header in the map... - ld hl, wCurrentMapSignpostHeaderPointer +; Get the pointer for the first BG event header in the map... + ld hl, wCurrMapBGEventHeaderPointer ld a, [hli] ld h, [hl] ld l, a -; ... before even checking to see if there are any signposts on this map. - ld a, [wCurrentMapSignpostCount] +; ... before even checking to see if there are any BG events on this map. + ld a, [wCurrMapBGEventCount] and a - jr z, .nosignpostitems -; For i = 1:wCurrentMapSignpostCount... + jr z, .nobgeventitems +; For i = 1:wCurrMapBGEventCount... .loop -; Store the counter in Buffer2, and store the signpost header pointer in the stack. +; Store the counter in Buffer2, and store the BG event header pointer in the stack. ld [Buffer2], a push hl -; Get the Y coordinate of the signpost. +; Get the Y coordinate of the BG event. call .GetFarByte ld e, a -; Is the Y coordinate of the signpost on the screen? If not, go to the next signpost. +; Is the Y coordinate of the BG event on the screen? If not, go to the next BG event. ld a, [Buffer3] sub e jr c, .next cp SCREEN_HEIGHT / 2 jr nc, .next -; Is the X coordinate of the signpost on the screen? If not, go to the next signpost. +; Is the X coordinate of the BG event on the screen? If not, go to the next BG event. call .GetFarByte ld d, a ld a, [Buffer4] @@ -314,9 +314,9 @@ CheckForHiddenItems: ; b8172 jr c, .next cp SCREEN_WIDTH / 2 jr nc, .next -; Is this signpost a hidden item? If not, go to the next signpost. +; Is this BG event a hidden item? If not, go to the next BG event. call .GetFarByte - cp SIGNPOST_ITEM + cp BGEVENT_ITEM jr nz, .next ; Has this item already been found? If not, set off the Itemfinder. ld a, [Buffer1] @@ -332,16 +332,16 @@ CheckForHiddenItems: ; b8172 jr z, .itemnearby .next -; Restore the signpost header pointer and increment it by the length of a signpost header. +; Restore the BG event header pointer and increment it by the length of a BG event header. pop hl ld bc, 5 add hl, bc -; Restore the signpost counter and decrement it. If it hits zero, there are no hidden items in range. +; Restore the BG event counter and decrement it. If it hits zero, there are no hidden items in range. ld a, [Buffer2] dec a jr nz, .loop -.nosignpostitems +.nobgeventitems xor a ret diff --git a/engine/map_object_action.asm b/engine/map_object_action.asm index 2a13f924e..ec5ad887e 100755 --- a/engine/map_object_action.asm +++ b/engine/map_object_action.asm @@ -1,5 +1,5 @@ -PersonActionPairPointers: ; 445f -; entries correspond to PERSON_ACTION_* constants +ObjectActionPairPointers: ; 445f +; entries correspond to OBJECT_ACTION_* constants dw SetFacingStanding, SetFacingStanding dw SetFacingStandAction, SetFacingCurrent dw SetFacingStepAction, SetFacingCurrent diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 971435fb0..c37e6d2cf 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -154,7 +154,7 @@ Function437b: ; 437b jr nz, SetFacingStanding bit 5, [hl] jr nz, asm_4448 - ld de, PersonActionPairPointers ; use first column + ld de, ObjectActionPairPointers ; use first column jr _HandleObjectAction ; 4440 @@ -164,7 +164,7 @@ Function4440: ; 4440 bit INVISIBLE, [hl] jr nz, SetFacingStanding asm_4448 - ld de, PersonActionPairPointers + 2 ; use second column + ld de, ObjectActionPairPointers + 2 ; use second column jr _HandleObjectAction ; 444d @@ -631,7 +631,7 @@ MapObjectMovementPattern: ; 47dd call EndSpriteMovement ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_STAND + ld [hl], OBJECT_ACTION_STAND ld hl, OBJECT_STEP_TYPE add hl, bc ld [hl], STEP_TYPE_05 @@ -650,20 +650,20 @@ MapObjectMovementPattern: ; 47dd jp HandleMovementData .Movement0a: - jp _GetMovementPerson + jp _GetMovementObject .Movement0b: - jp _GetMovementPerson + jp _GetMovementObject .Movement0c: - jp _GetMovementPerson + jp _GetMovementObject .Movement0d: ld hl, Function5000 jp HandleMovementData .Movement0e: - jp _GetMovementPerson + jp _GetMovementObject .Follow: ld hl, GetFollowerNextMovementByte @@ -781,7 +781,7 @@ MapObjectMovementPattern: ; 47dd ld [hl], STANDING ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_STAND + ld [hl], OBJECT_ACTION_STAND ret .MovementBigStanding: @@ -791,7 +791,7 @@ MapObjectMovementPattern: ; 47dd ld [hl], STANDING ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_BIG_SNORLAX + ld [hl], OBJECT_ACTION_BIG_SNORLAX ld hl, OBJECT_STEP_TYPE add hl, bc ld [hl], STEP_TYPE_04 @@ -804,7 +804,7 @@ MapObjectMovementPattern: ; 47dd ld [hl], STANDING ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_BOUNCE + ld [hl], OBJECT_ACTION_BOUNCE ld hl, OBJECT_STEP_TYPE add hl, bc ld [hl], STEP_TYPE_04 @@ -828,7 +828,7 @@ MapObjectMovementPattern: ; 47dd .MovementSpinRepeat: ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_STAND + ld [hl], OBJECT_ACTION_STAND ld hl, OBJECT_RANGE add hl, bc ld a, [hl] @@ -879,7 +879,7 @@ MapObjectMovementPattern: ; 47dd call ._MovementShadow_Grass_Emote_BoulderDust ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_SHADOW + ld [hl], OBJECT_ACTION_SHADOW ld hl, OBJECT_STEP_DURATION add hl, de ld a, [hl] @@ -916,7 +916,7 @@ MapObjectMovementPattern: ; 47dd call ._MovementShadow_Grass_Emote_BoulderDust ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_EMOTE + ld [hl], OBJECT_ACTION_EMOTE ld hl, OBJECT_STEP_DURATION add hl, bc ld [hl], 0 @@ -936,7 +936,7 @@ MapObjectMovementPattern: ; 47dd call ._MovementShadow_Grass_Emote_BoulderDust ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_BOULDER_DUST + ld [hl], OBJECT_ACTION_BOULDER_DUST ld hl, OBJECT_STEP_DURATION add hl, de ld a, [hl] @@ -980,7 +980,7 @@ MapObjectMovementPattern: ; 47dd call ._MovementShadow_Grass_Emote_BoulderDust ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_GRASS_SHAKE + ld [hl], OBJECT_ACTION_GRASS_SHAKE ld hl, OBJECT_STEP_DURATION add hl, de ld a, [hl] @@ -1013,7 +1013,7 @@ MapObjectMovementPattern: ; 47dd call EndSpriteMovement ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_00 + ld [hl], OBJECT_ACTION_00 ld hl, OBJECT_RANGE add hl, bc ld a, [hl] @@ -1053,7 +1053,7 @@ MapObjectMovementPattern: ; 47dd call UpdateTallGrassFlags ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_STEP + ld [hl], OBJECT_ACTION_STEP ld hl, wCenteredObject ld a, [hMapObjectIndexBuffer] cp [hl] @@ -1092,7 +1092,7 @@ SetRandomStepDuration: ; 4b2d ld [hl], STANDING ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_STAND + ld [hl], OBJECT_ACTION_STAND ld hl, OBJECT_STEP_TYPE add hl, bc ld [hl], STEP_TYPE_03 @@ -1245,7 +1245,7 @@ TeleportFrom: ; 4c18 .DoSpin: ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_SPIN + ld [hl], OBJECT_ACTION_SPIN ld hl, OBJECT_STEP_DURATION add hl, bc dec [hl] @@ -1270,7 +1270,7 @@ TeleportFrom: ; 4c18 .DoSpinRise: ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_SPIN + ld [hl], OBJECT_ACTION_SPIN ld hl, OBJECT_31 add hl, bc inc [hl] @@ -1310,7 +1310,7 @@ TeleportTo: ; 4c89 .InitWait: ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_00 + ld [hl], OBJECT_ACTION_00 ld hl, OBJECT_STEP_DURATION add hl, bc ld [hl], 16 @@ -1341,7 +1341,7 @@ TeleportTo: ; 4c89 .DoDescent: ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_SPIN + ld [hl], OBJECT_ACTION_SPIN ld hl, OBJECT_31 add hl, bc inc [hl] @@ -1369,7 +1369,7 @@ TeleportTo: ; 4c89 .DoFinalSpin: ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_SPIN + ld [hl], OBJECT_ACTION_SPIN ld hl, OBJECT_STEP_DURATION add hl, bc dec [hl] @@ -1399,7 +1399,7 @@ Skyfall: ; 4d14 .Init: ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_00 + ld [hl], OBJECT_ACTION_00 ld hl, OBJECT_STEP_DURATION add hl, bc ld [hl], 16 @@ -1411,7 +1411,7 @@ Skyfall: ; 4d14 ret nz ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_STEP + ld [hl], OBJECT_ACTION_STEP ld hl, OBJECT_STEP_FRAME add hl, bc ld [hl], 0 @@ -1496,9 +1496,9 @@ RockSmashStep: ; 4daf add hl, bc ld a, [hl] and %00000001 - ld a, PERSON_ACTION_STAND + ld a, OBJECT_ACTION_STAND jr z, .yes - ld a, PERSON_ACTION_00 + ld a, OBJECT_ACTION_00 .yes ld hl, OBJECT_ACTION add hl, bc @@ -1511,9 +1511,9 @@ ReturnDigStep: ; 4dc8 add hl, bc ld a, [hl] and %00000001 - ld a, PERSON_ACTION_SPIN + ld a, OBJECT_ACTION_SPIN jr z, .yes - ld a, PERSON_ACTION_SPIN_FLICKER + ld a, OBJECT_ACTION_SPIN_FLICKER .yes ld hl, OBJECT_ACTION add hl, bc @@ -1819,7 +1819,7 @@ SkyfallTop: ; 4f83 .Init: ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_SKYFALL + ld [hl], OBJECT_ACTION_SKYFALL ld hl, OBJECT_STEP_DURATION add hl, bc ld [hl], 16 @@ -1935,13 +1935,13 @@ Function5026: ; 5026 ret ; 5037 -_GetMovementPerson: ; 5037 - ld hl, GetMovementPerson +_GetMovementObject: ; 5037 + ld hl, GetMovementObject jp HandleMovementData ; 503d -GetMovementPerson: ; 503d - ld a, [wMovementPerson] +GetMovementObject: ; 503d + ld a, [wMovementObject] ret ; 5041 @@ -2540,7 +2540,7 @@ RefreshPlayerSprite: ; 579d ret .ok - ld a, PERSON_ACTION_00 + ld a, OBJECT_ACTION_00 ld [PlayerAction], a ret ; 57ca diff --git a/engine/movement.asm b/engine/movement.asm index ea661abbb..66c501909 100644 --- a/engine/movement.asm +++ b/engine/movement.asm @@ -60,8 +60,8 @@ MovementPointers: ; 5075 dw Movement_set_sliding ; 39 dw Movement_remove_fixed_facing ; 3a dw Movement_fix_facing ; 3b - dw Movement_show_person ; 3c - dw Movement_hide_person ; 3d + dw Movement_show_object ; 3c + dw Movement_hide_object ; 3d dw Movement_step_sleep_1 ; 3e dw Movement_step_sleep_2 ; 3f dw Movement_step_sleep_3 ; 40 @@ -73,7 +73,7 @@ MovementPointers: ; 5075 dw Movement_step_sleep ; 46 dw Movement_step_end ; 47 dw Movement_48 ; 48 - dw Movement_remove_person ; 49 + dw Movement_remove_object ; 49 dw Movement_step_loop ; 4a dw Movement_4b ; 4b dw Movement_teleport_from ; 4c @@ -130,7 +130,7 @@ Movement_step_dig: ; 5145 ld [hl], a ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_SPIN + ld [hl], OBJECT_ACTION_SPIN call JumpMovementPointer ld hl, OBJECT_STEP_DURATION add hl, bc @@ -167,7 +167,7 @@ Movement_return_dig: ; 516a Movement_fish_got_bite: ; 5189 ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_FISHING + ld [hl], OBJECT_ACTION_FISHING ld hl, OBJECT_STEP_TYPE add hl, bc ld [hl], STEP_TYPE_GOT_BITE @@ -181,7 +181,7 @@ Movement_rock_smash: ; 5196 ld [hl], a ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_STAND + ld [hl], OBJECT_ACTION_STAND ld hl, OBJECT_STEP_TYPE add hl, bc ld [hl], STEP_TYPE_ROCK_SMASH @@ -191,7 +191,7 @@ Movement_rock_smash: ; 5196 Movement_fish_cast_rod: ; 51ab ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_FISHING + ld [hl], OBJECT_ACTION_FISHING ld hl, OBJECT_STEP_TYPE add hl, bc ld [hl], STEP_TYPE_SLEEP @@ -248,7 +248,7 @@ Movement_48: ; 51db ret ; 51fd -Movement_remove_person: ; 51fd +Movement_remove_object: ; 51fd call DeleteMapObject ld hl, wObjectFollow_Leader ld a, [hMapObjectIndexBuffer] @@ -265,7 +265,7 @@ Movement_remove_person: ; 51fd Movement_4b: ; 5210 ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_STAND + ld [hl], OBJECT_ACTION_STAND ld hl, OBJECT_STEP_TYPE add hl, bc @@ -326,7 +326,7 @@ Movement_step_sleep_common: ; 5247 ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_STAND + ld [hl], OBJECT_ACTION_STAND ld hl, OBJECT_DIRECTION_WALKING add hl, bc @@ -346,7 +346,7 @@ Movement_step_bump: ; 525f ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_BUMP + ld [hl], OBJECT_ACTION_BUMP ld hl, OBJECT_DIRECTION_WALKING add hl, bc @@ -366,7 +366,7 @@ Movement_tree_shake: ; 5279 ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_WEIRD_TREE + ld [hl], OBJECT_ACTION_WEIRD_TREE ld hl, OBJECT_DIRECTION_WALKING add hl, bc @@ -402,14 +402,14 @@ Movement_fix_facing: ; 52ae jp ContinueReadingMovement ; 52b7 -Movement_show_person: ; 52b7 +Movement_show_object: ; 52b7 ld hl, OBJECT_FLAGS1 add hl, bc res INVISIBLE, [hl] jp ContinueReadingMovement ; 52c0 -Movement_hide_person: ; 52c0 +Movement_hide_object: ; 52c0 ld hl, OBJECT_FLAGS1 add hl, bc set INVISIBLE, [hl] @@ -458,7 +458,7 @@ TurnHead: ; 52ee ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_STAND + ld [hl], OBJECT_ACTION_STAND ld hl, OBJECT_DIRECTION_WALKING add hl, bc @@ -733,7 +733,7 @@ TurnStep: ; 5400 ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_STEP + ld [hl], OBJECT_ACTION_STEP ld hl, OBJECT_STEP_TYPE add hl, bc @@ -746,7 +746,7 @@ NormalStep: ; 5412 call UpdateTallGrassFlags ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_STEP + ld [hl], OBJECT_ACTION_STEP ld hl, OBJECT_NEXT_TILE add hl, bc @@ -784,7 +784,7 @@ TurningStep: ; 5446 ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_SPIN + ld [hl], OBJECT_ACTION_SPIN ld hl, wCenteredObject ld a, [hMapObjectIndexBuffer] @@ -810,7 +810,7 @@ SlideStep: ; 5468 ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_STAND + ld [hl], OBJECT_ACTION_STAND ld hl, wCenteredObject ld a, [hMapObjectIndexBuffer] @@ -842,7 +842,7 @@ JumpStep: ; 548a ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_STEP + ld [hl], OBJECT_ACTION_STEP call SpawnShadow diff --git a/engine/npc_movement.asm b/engine/npc_movement.asm index e102cc554..a2508e0f6 100755 --- a/engine/npc_movement.asm +++ b/engine/npc_movement.asm @@ -35,7 +35,7 @@ Function6ec1: ; 6ec1 push hl push bc - call WillPersonBumpIntoSomeoneElse + call WillObjectBumpIntoSomeoneElse pop bc pop hl ret c @@ -44,12 +44,12 @@ Function6ec1: ; 6ec1 bit 5, [hl] jr nz, .bit_5 push hl - call HasPersonReachedMovementLimit + call HasObjectReachedMovementLimit pop hl ret c push hl - call IsPersonMovingOffEdgeOfScreen + call IsObjectMovingOffEdgeOfScreen pop hl ret c @@ -269,7 +269,7 @@ CheckFacingObject:: ; 6fd9 ; 7009 -WillPersonBumpIntoSomeoneElse: ; 7009 +WillObjectBumpIntoSomeoneElse: ; 7009 ld hl, OBJECT_NEXT_MAP_X add hl, bc ld d, [hl] @@ -391,7 +391,7 @@ IsNPCAtCoord: ; 7041 ret ; 70a4 -HasPersonReachedMovementLimit: ; 70a4 +HasObjectReachedMovementLimit: ; 70a4 ld hl, OBJECT_RADIUS add hl, bc ld a, [hl] @@ -451,7 +451,7 @@ HasPersonReachedMovementLimit: ; 70a4 ret ; 70ed -IsPersonMovingOffEdgeOfScreen: ; 70ed +IsObjectMovingOffEdgeOfScreen: ; 70ed ld hl, OBJECT_NEXT_MAP_X add hl, bc ld a, [XCoord] diff --git a/engine/player_object.asm b/engine/player_object.asm index 232d31bc2..fe19d15b5 100755 --- a/engine/player_object.asm +++ b/engine/player_object.asm @@ -29,14 +29,14 @@ SpawnPlayer: ; 8029 call GetMapObject ld hl, MAPOBJECT_COLOR add hl, bc - ln e, PAL_NPC_RED, PERSONTYPE_SCRIPT + ln e, PAL_NPC_RED, OBJECTTYPE_SCRIPT ld a, [wPlayerSpriteSetupFlags] bit 2, a jr nz, .ok ld a, [PlayerGender] bit 0, a jr z, .ok - ln e, PAL_NPC_BLUE, PERSONTYPE_SCRIPT + ln e, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT .ok ld [hl], e @@ -55,7 +55,7 @@ PlayerObjectTemplate: ; 8071 ; A dummy map object used to initialize the player object. ; Shorter than the actual amount copied by two bytes. ; Said bytes seem to be unused. - person_event SPRITE_CHRIS, -4, -4, SPRITEMOVEDATA_PLAYER, 15, 15, -1, -1, 0, PERSONTYPE_SCRIPT, 0, 0, -1 + object_event SPRITE_CHRIS, -4, -4, SPRITEMOVEDATA_PLAYER, 15, 15, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, 0, -1 CopyDECoordsToMapObject:: ; 807e push de @@ -82,7 +82,7 @@ PlayerSpawn_ConvertCoords: ; 808f call CopyDECoordsToMapObject ret -WritePersonXY:: ; 80a1 +WriteObjectXY:: ; 80a1 ld a, b call CheckObjectVisibility ret c @@ -616,7 +616,7 @@ FollowNotExact:: ; 839e call CheckObjectVisibility ret c -; Person 2 is now in bc, person 1 is now in de +; object 2 is now in bc, object 1 is now in de ld hl, OBJECT_NEXT_MAP_X add hl, bc ld a, [hl] diff --git a/engine/scripting.asm b/engine/scripting.asm index c5b0fd982..9818bbac3 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -82,10 +82,10 @@ ScriptCommandTable: dw Script_callasm ; 0e dw Script_special ; 0f dw Script_ptcallasm ; 10 - dw Script_checkmaptriggers ; 11 - dw Script_domaptrigger ; 12 - dw Script_checktriggers ; 13 - dw Script_dotrigger ; 14 + dw Script_checkmapscene ; 11 + dw Script_setmapscene ; 12 + dw Script_checkscene ; 13 + dw Script_setscene ; 14 dw Script_writebyte ; 15 dw Script_addvar ; 16 dw Script_random ; 17 @@ -175,14 +175,14 @@ ENDC dw Script_applymovement ; 69 dw Script_applymovement2 ; 6a dw Script_faceplayer ; 6b - dw Script_faceperson ; 6c + dw Script_faceobject ; 6c dw Script_variablesprite ; 6d dw Script_disappear ; 6e dw Script_appear ; 6f dw Script_follow ; 70 dw Script_stopfollow ; 71 - dw Script_moveperson ; 72 - dw Script_writepersonxy ; 73 + dw Script_moveobject ; 72 + dw Script_writeobjectxy ; 73 dw Script_loademote ; 74 dw Script_showemote ; 75 dw Script_spriteface ; 76 @@ -979,7 +979,7 @@ Script_cry: call PlayCry ret -GetScriptPerson: +GetScriptObject: and a ; PLAYER? ret z cp LAST_TALKED @@ -990,21 +990,21 @@ GetScriptPerson: Script_setlasttalked: ; script command 0x68 ; parameters: -; person (SingleByteParam) +; object id (SingleByteParam) call GetScriptByte - call GetScriptPerson + call GetScriptObject ld [hLastTalked], a ret Script_applymovement: ; script command 0x69 ; parameters: -; person (SingleByteParam) +; object id (SingleByteParam) ; data (MovementPointerLabelParam) call GetScriptByte - call GetScriptPerson + call GetScriptObject ld c, a ApplyMovement: @@ -1061,24 +1061,24 @@ Script_faceplayer: ld e, a ld a, [hLastTalked] ld d, a - call ApplyPersonFacing + call ApplyObjectFacing ret -Script_faceperson: +Script_faceobject: ; script command 0x6c ; parameters: -; person1 (SingleByteParam) -; person2 (SingleByteParam) +; object1 (SingleByteParam) +; object2 (SingleByteParam) call GetScriptByte - call GetScriptPerson + call GetScriptObject cp LAST_TALKED jr c, .ok ld a, [hLastTalked] .ok ld e, a call GetScriptByte - call GetScriptPerson + call GetScriptObject cp LAST_TALKED jr nz, .ok2 ld a, [hLastTalked] @@ -1093,17 +1093,17 @@ Script_faceperson: add a ld e, a ld d, c - call ApplyPersonFacing + call ApplyObjectFacing ret Script_spriteface: ; script command 0x76 ; parameters: -; person (SingleByteParam) +; object id (SingleByteParam) ; facing (SingleByteParam) call GetScriptByte - call GetScriptPerson + call GetScriptObject cp LAST_TALKED jr nz, .ok ld a, [hLastTalked] @@ -1113,10 +1113,10 @@ Script_spriteface: add a add a ld e, a - call ApplyPersonFacing + call ApplyObjectFacing ret -ApplyPersonFacing: +ApplyObjectFacing: ld a, d push de call CheckObjectVisibility @@ -1179,10 +1179,10 @@ Script_variablesprite: Script_appear: ; script command 0x6f ; parameters: -; person (SingleByteParam) +; object id (SingleByteParam) call GetScriptByte - call GetScriptPerson + call GetScriptObject call _CopyObjectStruct ld a, [hMapObjectIndexBuffer] ld b, 0 ; clear @@ -1192,10 +1192,10 @@ Script_appear: Script_disappear: ; script command 0x6e ; parameters: -; person (SingleByteParam) +; object id (SingleByteParam) call GetScriptByte - call GetScriptPerson + call GetScriptObject cp LAST_TALKED jr nz, .ok ld a, [hLastTalked] @@ -1230,14 +1230,14 @@ ApplyEventActionAppearDisappear: Script_follow: ; script command 0x70 ; parameters: -; person2 (SingleByteParam) -; person1 (SingleByteParam) +; object2 (SingleByteParam) +; object1 (SingleByteParam) call GetScriptByte - call GetScriptPerson + call GetScriptObject ld b, a call GetScriptByte - call GetScriptPerson + call GetScriptObject ld c, a farcall StartFollow ret @@ -1248,15 +1248,15 @@ Script_stopfollow: farcall StopFollow ret -Script_moveperson: +Script_moveobject: ; script command 0x72 ; parameters: -; person (SingleByteParam) +; object id (SingleByteParam) ; x (SingleByteParam) ; y (SingleByteParam) call GetScriptByte - call GetScriptPerson + call GetScriptObject ld b, a call GetScriptByte add 4 @@ -1267,32 +1267,32 @@ Script_moveperson: farcall CopyDECoordsToMapObject ret -Script_writepersonxy: +Script_writeobjectxy: ; script command 0x73 ; parameters: -; person (SingleByteParam) +; object id (SingleByteParam) call GetScriptByte - call GetScriptPerson + call GetScriptObject cp LAST_TALKED jr nz, .ok ld a, [hLastTalked] .ok ld b, a - farcall WritePersonXY + farcall WriteObjectXY ret Script_follownotexact: ; script command 0x77 ; parameters: -; person2 (SingleByteParam) -; person1 (SingleByteParam) +; object2 (SingleByteParam) +; object1 (SingleByteParam) call GetScriptByte - call GetScriptPerson + call GetScriptObject ld b, a call GetScriptByte - call GetScriptPerson + call GetScriptObject ld c, a farcall FollowNotExact ret @@ -1315,13 +1315,13 @@ Script_showemote: ; script command 0x75 ; parameters: ; bubble (SingleByteParam) -; person (SingleByteParam) +; object id (SingleByteParam) ; time (DecimalParam) call GetScriptByte ld [ScriptVar], a call GetScriptByte - call GetScriptPerson + call GetScriptObject cp LAST_TALKED jr z, .ok ld [hLastTalked], a @@ -1751,20 +1751,20 @@ Script_priorityjump: set 3, [hl] ret -Script_checktriggers: +Script_checkscene: ; script command 0x13 - call CheckTriggers - jr z, .no_triggers + call CheckScenes + jr z, .no_scene ld [ScriptVar], a ret -.no_triggers +.no_scene ld a, $ff ld [ScriptVar], a ret -Script_checkmaptriggers: +Script_checkmapscene: ; script command 0x11 ; parameters: ; map_group (SingleByteParam) @@ -1774,49 +1774,49 @@ Script_checkmaptriggers: ld b, a call GetScriptByte ld c, a - call GetMapTrigger + call GetMapSceneID ld a, d or e - jr z, .no_triggers + jr z, .no_scene ld a, [de] ld [ScriptVar], a ret -.no_triggers +.no_scene ld a, $ff ld [ScriptVar], a ret -Script_dotrigger: +Script_setscene: ; script command 0x14 ; parameters: -; trigger_id (SingleByteParam) +; scene_id (SingleByteParam) ld a, [MapGroup] ld b, a ld a, [MapNumber] ld c, a - jr DoTrigger + jr DoScene -Script_domaptrigger: +Script_setmapscene: ; script command 0x12 ; parameters: ; map_group (MapGroupParam) ; map_id (MapIdParam) -; trigger_id (SingleByteParam) +; scene_id (SingleByteParam) call GetScriptByte ld b, a call GetScriptByte ld c, a -DoTrigger: - call GetMapTrigger +DoScene: + call GetMapSceneID ld a, d or e - jr z, .no_trigger + jr z, .no_scene call GetScriptByte ld [de], a -.no_trigger +.no_scene ret Script_copybytetovar: diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 020875ff7..b31f7a415 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -297,7 +297,7 @@ RadioTowerRocketsScript: clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST specialphonecall SPECIALCALL_WEIRDBROADCAST - domaptrigger MAHOGANY_TOWN, $1 + setmapscene MAHOGANY_TOWN, $1 end BugContestResultsWarpScript: @@ -354,8 +354,8 @@ BugContestResults_DidNotLeaveMons waitbutton BugContestResults_CleanUp closetext - dotrigger $0 - domaptrigger ROUTE_35_NATIONAL_PARK_GATE, $0 + setscene $0 + setmapscene ROUTE_35_NATIONAL_PARK_GATE, $0 setevent EVENT_BUG_CATCHING_CONTESTANT_1A setevent EVENT_BUG_CATCHING_CONTESTANT_2A setevent EVENT_BUG_CATCHING_CONTESTANT_3A diff --git a/engine/trainer_scripts.asm b/engine/trainer_scripts.asm index 33dab3b9e..212cd7f28 100644 --- a/engine/trainer_scripts.asm +++ b/engine/trainer_scripts.asm @@ -12,8 +12,8 @@ SeenByTrainerScript:: ; 0xbe675 showemote EMOTE_SHOCK, LAST_TALKED, 30 callasm TrainerWalkToPlayer applymovement2 MovementBuffer - writepersonxy LAST_TALKED - faceperson PLAYER, LAST_TALKED + writeobjectxy LAST_TALKED + faceobject PLAYER, LAST_TALKED jump StartBattleWithMapTrainerScript StartBattleWithMapTrainerScript: ; 0xbe68a diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm index e442aec8e..fadf7d4a6 100755 --- a/engine/warp_connection.asm +++ b/engine/warp_connection.asm @@ -3,7 +3,7 @@ HandleNewMap: ; 1045b0 call Clearwc7e8 call ResetMapBufferEventFlags call ResetFlashIfOutOfCave - call GetCurrentMapTrigger + call GetCurrentMapSceneID call ResetBikeFlags ld a, MAPCALLBACK_NEWMAP call RunMapCallback diff --git a/event/bug_contest/judging.asm b/event/bug_contest/judging.asm index fea442a65..901ae88fa 100755 --- a/event/bug_contest/judging.asm +++ b/event/bug_contest/judging.asm @@ -2,21 +2,21 @@ _BugContestJudging: ; 1369d call ContestScore farcall TrainerRankings_BugContestScore call BugContest_JudgeContestants - ld a, [wBugContestThirdPlacePersonID] + ld a, [wBugContestThirdPlaceWinnerID] call LoadContestantName ld a, [wBugContestThirdPlaceMon] ld [wNamedObjectIndexBuffer], a call GetPokemonName ld hl, BugContest_ThirdPlaceText call PrintText - ld a, [wBugContestSecondPlacePersonID] + ld a, [wBugContestSecondPlaceWinnerID] call LoadContestantName ld a, [wBugContestSecondPlaceMon] ld [wNamedObjectIndexBuffer], a call GetPokemonName ld hl, BugContest_SecondPlaceText call PrintText - ld a, [wBugContestFirstPlacePersonID] + ld a, [wBugContestFirstPlaceWinnerID] call LoadContestantName ld a, [wBugContestFirstPlaceMon] ld [wNamedObjectIndexBuffer], a @@ -140,7 +140,7 @@ INCLUDE "data/bug_contest_winners.asm" BugContest_GetPlayersResult: ; 13807 - ld hl, wBugContestThirdPlacePersonID + ld hl, wBugContestThirdPlaceWinnerID ld de, -4 ld b, 3 .loop @@ -158,7 +158,7 @@ BugContest_GetPlayersResult: ; 13807 BugContest_JudgeContestants: ; 13819 call ClearContestResults call ComputeAIContestantScores - ld hl, wBugContestTempPersonID + ld hl, wBugContestTempWinnerID ld a, 1 ; Player ld [hli], a ld a, [wContestMon] @@ -188,15 +188,15 @@ DetermineContestWinners: ; 1383e ld c, 2 call StringCmp jr c, .not_first_place - ld hl, wBugContestSecondPlacePersonID - ld de, wBugContestThirdPlacePersonID + ld hl, wBugContestSecondPlaceWinnerID + ld de, wBugContestThirdPlaceWinnerID ld bc, 4 call CopyBytes - ld hl, wBugContestFirstPlacePersonID - ld de, wBugContestSecondPlacePersonID + ld hl, wBugContestFirstPlaceWinnerID + ld de, wBugContestSecondPlaceWinnerID ld bc, 4 call CopyBytes - ld hl, wBugContestFirstPlacePersonID + ld hl, wBugContestFirstPlaceWinnerID call CopyTempContestant jr .done @@ -206,11 +206,11 @@ DetermineContestWinners: ; 1383e ld c, 2 call StringCmp jr c, .not_second_place - ld hl, wBugContestSecondPlacePersonID - ld de, wBugContestThirdPlacePersonID + ld hl, wBugContestSecondPlaceWinnerID + ld de, wBugContestThirdPlaceWinnerID ld bc, 4 call CopyBytes - ld hl, wBugContestSecondPlacePersonID + ld hl, wBugContestSecondPlaceWinnerID call CopyTempContestant jr .done @@ -220,7 +220,7 @@ DetermineContestWinners: ; 1383e ld c, 2 call StringCmp jr c, .done - ld hl, wBugContestThirdPlacePersonID + ld hl, wBugContestThirdPlaceWinnerID call CopyTempContestant .done @@ -229,7 +229,7 @@ DetermineContestWinners: ; 1383e CopyTempContestant: ; 138a0 ; Could've just called CopyBytes. - ld de, wBugContestTempPersonID + ld de, wBugContestTempWinnerID rept 3 ld a, [de] inc de @@ -251,7 +251,7 @@ ComputeAIContestantScores: ; 138b0 ld a, e inc a inc a - ld [wBugContestTempPersonID], a + ld [wBugContestTempWinnerID], a dec a ld c, a ld b, 0 diff --git a/event/overworld.asm b/event/overworld.asm index 584617e27..370162fa9 100755 --- a/event/overworld.asm +++ b/event/overworld.asm @@ -881,11 +881,11 @@ dig_incave .DigOut: ; 0xcc59 step_dig 32 - hide_person + hide_object step_end .DigReturn: ; 0xcc5d - show_person + show_object return_dig 32 step_end diff --git a/event/std_collision.asm b/event/std_collision.asm index 17b1e49b2..79dbc71f1 100644 --- a/event/std_collision.asm +++ b/event/std_collision.asm @@ -1,4 +1,4 @@ -CheckFacingTileForStd:: ; 1365b +CheckFacingTileForStdScript:: ; 1365b ; Checks to see if the tile you're facing has a std script associated with it. If so, executes the script and returns carry. ld a, c ld de, 3 diff --git a/home.asm b/home.asm index 71cb0c190..18c1ce300 100644 --- a/home.asm +++ b/home.asm @@ -861,7 +861,7 @@ HandleStoneQueue:: ; 3567 ld l, a push hl - call .IsPersonOnWarp + call .IsObjectOnWarp pop hl jr nc, .nope ld d, a @@ -878,7 +878,7 @@ HandleStoneQueue:: ; 3567 ret ; 3599 -.IsPersonOnWarp: ; 3599 +.IsObjectOnWarp: ; 3599 push de ld hl, OBJECT_NEXT_MAP_X diff --git a/home/map.asm b/home/map.asm index 4171bf9f3..37022e234 100644 --- a/home/map.asm +++ b/home/map.asm @@ -8,61 +8,61 @@ Clearwc7e8:: ; 210f ret ; 211b -CheckTriggers:: ; 211b -; Checks wCurrentMapTriggerPointer. If it's empty, returns -1 in a. Otherwise, returns the active trigger ID in a. +CheckScenes:: ; 211b +; Checks wCurrMapSceneScriptPointer. If it's empty, returns -1 in a. Otherwise, returns the active scene ID in a. push hl - ld hl, wCurrentMapTriggerPointer + ld hl, wCurrMapSceneScriptPointer ld a, [hli] ld h, [hl] ld l, a or h ld a, [hl] - jr nz, .triggerexists + jr nz, .scene_exists ld a, -1 -.triggerexists +.scene_exists pop hl ret ; 212a -GetCurrentMapTrigger:: ; 212a -; Grabs the wram map trigger pointer for the current map and loads it into wCurrentMapTriggerPointer. -; If there are no triggers, both bytes of wCurrentMapTriggerPointer are wiped clean. -; Copy the current map group and number into bc. This is needed for GetMapTrigger. +GetCurrentMapSceneID:: ; 212a +; Grabs the wram map scene script pointer for the current map and loads it into wCurrMapSceneScriptPointer. +; If there is no scene, both bytes of wCurrMapSceneScriptPointer are wiped clean. +; Copy the current map group and number into bc. This is needed for GetMapSceneID. ld a, [MapGroup] ld b, a ld a, [MapNumber] ld c, a -; Blank out wCurrentMapTriggerPointer; this is the default scenario. +; Blank out wCurrMapSceneScriptPointer; this is the default scenario. xor a - ld [wCurrentMapTriggerPointer], a - ld [wCurrentMapTriggerPointer + 1], a - call GetMapTrigger - ret c ; The map is not in the trigger table -; Load the trigger table pointer from de into wCurrentMapTriggerPointer + ld [wCurrMapSceneScriptPointer], a + ld [wCurrMapSceneScriptPointer + 1], a + call GetMapSceneID + ret c ; The map is not in the scene script table +; Load the scene script pointer from de into wCurrMapSceneScriptPointer ld a, e - ld [wCurrentMapTriggerPointer], a + ld [wCurrMapSceneScriptPointer], a ld a, d - ld [wCurrentMapTriggerPointer + 1], a + ld [wCurrMapSceneScriptPointer + 1], a xor a ret ; 2147 -GetMapTrigger:: ; 2147 -; Searches the trigger table for the map group and number loaded in bc, and returns the wram pointer in de. -; If the map is not in the trigger table, returns carry. +GetMapSceneID:: ; 2147 +; Searches the scene script table for the map group and number loaded in bc, and returns the wram pointer in de. +; If the map is not in the scene script table, returns carry. push bc ld a, [hROMBank] push af - ld a, BANK(MapTriggers) + ld a, BANK(MapScenes) rst Bankswitch - ld hl, MapTriggers + ld hl, MapScenes .loop push hl ld a, [hli] ; map group, or terminator cp -1 - jr z, .end ; the current map is not in the trigger table + jr z, .end ; the current map is not in the scene script table cp b jr nz, .next ; map group did not match ld a, [hli] ; map number @@ -72,7 +72,7 @@ GetMapTrigger:: ; 2147 .next pop hl - ld de, 4 ; size of an entry in the trigger table + ld de, 4 ; size of an entry in the scene script table add hl, de jr .loop @@ -430,7 +430,7 @@ ReadMapEventHeader:: ; 2336 inc hl call ReadWarps call ReadCoordEvents - call ReadSignposts + call ReadBGEvents pop af and a @@ -445,7 +445,7 @@ ReadMapScripts:: ; 234f ld a, [hli] ld h, [hl] ld l, a - call ReadMapTriggers + call ReadMapSceneScripts call ReadMapCallbacks ret ; 235c @@ -511,19 +511,19 @@ GetMapConnection:: ; 23a3 ret ; 23ac -ReadMapTriggers:: ; 23ac - ld a, [hli] ; trigger count +ReadMapSceneScripts:: ; 23ac + ld a, [hli] ; scene script count ld c, a - ld [wCurrMapTriggerCount], a ; current map trigger count + ld [wCurrMapSceneScriptCount], a ; current map scene script count ld a, l - ld [wCurrMapTriggerHeaderPointer], a ; map trigger pointer + ld [wCurrMapSceneScriptHeaderPointer], a ; map scene script pointer ld a, h - ld [wCurrMapTriggerHeaderPointer + 1], a + ld [wCurrMapSceneScriptHeaderPointer + 1], a ld a, c and a ret z - ld bc, 4 ; size of a map trigger header entry + ld bc, 4 ; size of a map scene script header entry call AddNTimes ret ; 23c3 @@ -564,11 +564,11 @@ ReadWarps:: ; 23da ReadCoordEvents:: ; 23f1 ld a, [hli] ld c, a - ld [wCurrentMapXYTriggerCount], a + ld [wCurrMapCoordEventCount], a ld a, l - ld [wCurrentMapXYTriggerHeaderPointer], a + ld [wCurrMapCoordEventHeaderPointer], a ld a, h - ld [wCurrentMapXYTriggerHeaderPointer + 1], a + ld [wCurrMapCoordEventHeaderPointer + 1], a ld a, c and a @@ -579,14 +579,14 @@ ReadCoordEvents:: ; 23f1 ret ; 2408 -ReadSignposts:: ; 2408 +ReadBGEvents:: ; 2408 ld a, [hli] ld c, a - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld a, l - ld [wCurrentMapSignpostHeaderPointer], a + ld [wCurrMapBGEventHeaderPointer], a ld a, h - ld [wCurrentMapSignpostHeaderPointer + 1], a + ld [wCurrMapBGEventHeaderPointer + 1], a ld a, c and a @@ -604,17 +604,17 @@ ReadObjectEvents:: ; 241f ld hl, Map1Object ld a, [de] inc de - ld [wCurrentMapPersonEventCount], a + ld [wCurrMapObjectEventCount], a ld a, e - ld [wCurrentMapPersonEventHeaderPointer], a + ld [wCurrMapObjectEventHeaderPointer], a ld a, d - ld [wCurrentMapPersonEventHeaderPointer + 1], a + ld [wCurrMapObjectEventHeaderPointer + 1], a - ld a, [wCurrentMapPersonEventCount] + ld a, [wCurrMapObjectEventCount] call CopyMapObjectHeaders -; get NUM_OBJECTS - [wCurrentMapPersonEventCount] - ld a, [wCurrentMapPersonEventCount] +; get NUM_OBJECTS - [wCurrMapObjectEventCount] + ld a, [wCurrMapObjectEventCount] ld c, a ld a, NUM_OBJECTS ; - 1 sub c @@ -1110,7 +1110,7 @@ Call_a_de:: ; 26b7 ; 26c7 GetMovementData:: ; 26c7 -; Initialize the movement data for person c at b:hl +; Initialize the movement data for object c at b:hl ld a, [hROMBank] push af ld a, b @@ -1840,7 +1840,7 @@ GetBlockLocation:: ; 2a66 ret ; 2a8b -CheckFacingSign:: ; 2a8b +CheckFacingBGEvent:: ; 2a8b call GetFacingTileCoord ; Load facing into b. ld b, a @@ -1851,8 +1851,8 @@ CheckFacingSign:: ; 2a8b ld a, e sub 4 ld e, a -; If there are no signposts, we don't need to be here. - ld a, [wCurrentMapSignpostCount] +; If there are no BG events, we don't need to be here. + ld a, [wCurrMapBGEventCount] and a ret z @@ -1860,16 +1860,16 @@ CheckFacingSign:: ; 2a8b ld a, [hROMBank] push af call SwitchToMapScriptHeaderBank - call CheckIfFacingTileCoordIsSign + call CheckIfFacingTileCoordIsBGEvent pop hl ld a, h rst Bankswitch ret ; 2aaa -CheckIfFacingTileCoordIsSign:: ; 2aaa -; Checks to see if you are facing a signpost. If so, copies it into EngineBuffer1 and sets carry. - ld hl, wCurrentMapSignpostHeaderPointer +CheckIfFacingTileCoordIsBGEvent:: ; 2aaa +; Checks to see if you are facing a BG event. If so, copies it into EngineBuffer1 and sets carry. + ld hl, wCurrMapBGEventHeaderPointer ld a, [hli] ld h, [hl] ld l, a @@ -1885,7 +1885,7 @@ CheckIfFacingTileCoordIsSign:: ; 2aaa .next pop hl - ld a, 5 ; signpost event length + ld a, 5 ; BG event event length add l ld l, a jr nc, .nocarry @@ -1899,39 +1899,39 @@ CheckIfFacingTileCoordIsSign:: ; 2aaa .copysign pop hl - ld de, wCurSignpostYCoord - ld bc, 5 ; signpost event length + ld de, wCurBGEventYCoord + ld bc, 5 ; BG event event length call CopyBytes scf ret ; 2ad4 -CheckCurrentMapXYTriggers:: ; 2ad4 -; If there are no xy triggers, we don't need to be here. - ld a, [wCurrentMapXYTriggerCount] +CheckCurrentMapCoordEvents:: ; 2ad4 +; If there are no coord events, we don't need to be here. + ld a, [wCurrMapCoordEventCount] and a ret z -; Copy the trigger count into c. +; Copy the coord event count into c. ld c, a ld a, [hROMBank] push af call SwitchToMapScriptHeaderBank - call .TriggerCheck + call .CoordEventCheck pop hl ld a, h rst Bankswitch ret -.TriggerCheck: -; Checks to see if you are standing on an xy-trigger. If yes, copies the trigger to EngineBuffer1 and sets carry. - ld hl, wCurrentMapXYTriggerHeaderPointer +.CoordEventCheck: +; Checks to see if you are standing on a coord event. If yes, copies the event to EngineBuffer1 and sets carry. + ld hl, wCurrMapCoordEventHeaderPointer ld a, [hli] ld h, [hl] ld l, a -; Load the active trigger ID into b - call CheckTriggers +; Load the active scene ID into b + call CheckScenes ld b, a -; Load your current coordinates into de. This will be used to check if your position is in the xy-trigger table for the current map. +; Load your current coordinates into de. This will be used to check if your position is in the coord event table for the current map. ld a, [PlayerStandingMapX] sub 4 ld d, a @@ -1954,11 +1954,11 @@ CheckCurrentMapXYTriggers:: ; 2ad4 ld a, [hli] cp d jr nz, .next - jr .copytrigger + jr .copy_coord_event .next pop hl - ld a, $8 ; xy-trigger size + ld a, $8 ; coord event size add l ld l, a jr nc, .nocarry @@ -1970,10 +1970,10 @@ CheckCurrentMapXYTriggers:: ; 2ad4 xor a ret -.copytrigger +.copy_coord_event pop hl - ld de, wCurCoordEventTriggerID - ld bc, 8 ; xy-trigger size + ld de, wCurCoordEventSceneID + ld bc, 8 ; coord event size call CopyBytes scf ret diff --git a/home/map_objects.asm b/home/map_objects.asm index 4e88a050a..3857bef0c 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -414,15 +414,15 @@ CopyPlayerObjectTemplate:: ; 19a6 ; 19e9 LoadMovementDataPointer:: ; 19e9 -; Load the movement data pointer for person a. - ld [wMovementPerson], a +; Load the movement data pointer for object a. + ld [wMovementObject], a ld a, [hROMBank] ld [wMovementDataPointer], a ld a, l ld [wMovementDataPointer + 1], a ld a, h ld [wMovementDataPointer + 2], a - ld a, [wMovementPerson] + ld a, [wMovementObject] call CheckObjectVisibility ret c diff --git a/home/movement.asm b/home/movement.asm index f006916a4..0a2623a09 100644 --- a/home/movement.asm +++ b/home/movement.asm @@ -1,5 +1,5 @@ InitMovementBuffer:: ; 1b1e - ld [wMovementBufferPerson], a + ld [wMovementBufferObject], a xor a ld [wMovementBufferCount], a ld a, $0 ; useless diff --git a/macros/scripts/event.asm b/macros/scripts/event.asm index c40d6f8fd..1bf6b8622 100644 --- a/macros/scripts/event.asm +++ b/macros/scripts/event.asm @@ -112,28 +112,28 @@ ptcallasm: macro dw \1 ; asm endm - enum checkmaptriggers_command ; $11 -checkmaptriggers: macro - db checkmaptriggers_command + enum checkmapscene_command ; $11 +checkmapscene: macro + db checkmapscene_command map \1 ; map endm - enum domaptrigger_command ; $12 -domaptrigger: macro - db domaptrigger_command + enum setmapscene_command ; $12 +setmapscene: macro + db setmapscene_command map \1 ; map - db \2 ; trigger_id + db \2 ; scene_id endm - enum checktriggers_command ; $13 -checktriggers: macro - db checktriggers_command + enum checkscene_command ; $13 +checkscene: macro + db checkscene_command endm - enum dotrigger_command ; $14 -dotrigger: macro - db dotrigger_command - db \1 ; trigger_id + enum setscene_command ; $14 +setscene: macro + db setscene_command + db \1 ; scene_id endm enum writebyte_command ; $15 @@ -665,13 +665,13 @@ check_just_battled: macro enum setlasttalked_command ; $68 setlasttalked: macro db setlasttalked_command - db \1 ; person + db \1 ; object id endm enum applymovement_command ; $69 applymovement: macro db applymovement_command - db \1 ; person + db \1 ; object id dw \2 ; data endm @@ -686,11 +686,11 @@ faceplayer: macro db faceplayer_command endm - enum faceperson_command ; $6c -faceperson: macro - db faceperson_command - db \1 ; person1 - db \2 ; person2 + enum faceobject_command ; $6c +faceobject: macro + db faceobject_command + db \1 ; object1 + db \2 ; object2 endm enum variablesprite_command ; $6d @@ -703,20 +703,20 @@ variablesprite: macro enum disappear_command ; $6e disappear: macro db disappear_command - db \1 ; person + db \1 ; object id endm enum appear_command ; $6f appear: macro db appear_command - db \1 ; person + db \1 ; object id endm enum follow_command ; $70 follow: macro db follow_command - db \1 ; person2 - db \2 ; person1 + db \1 ; object2 + db \2 ; object1 endm enum stopfollow_command ; $71 @@ -724,18 +724,18 @@ stopfollow: macro db stopfollow_command endm - enum moveperson_command ; $72 -moveperson: macro - db moveperson_command - db \1 ; person + enum moveobject_command ; $72 +moveobject: macro + db moveobject_command + db \1 ; object id db \2 ; x db \3 ; y endm - enum writepersonxy_command ; $73 -writepersonxy: macro - db writepersonxy_command - db \1 ; person + enum writeobjectxy_command ; $73 +writeobjectxy: macro + db writeobjectxy_command + db \1 ; object id endm enum loademote_command ; $74 @@ -748,22 +748,22 @@ loademote: macro showemote: macro db showemote_command db \1 ; bubble - db \2 ; person + db \2 ; object id db \3 ; time endm enum spriteface_command ; $76 spriteface: macro db spriteface_command - db \1 ; person + db \1 ; object id db \2 ; facing endm enum follownotexact_command ; $77 follownotexact: macro db follownotexact_command - db \1 ; person2 - db \2 ; person1 + db \1 ; object2 + db \2 ; object1 endm enum earthquake_command ; $78 diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 6c1e0b6b6..3f83740ca 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -4,7 +4,7 @@ map: macro endm -maptrigger: macro +scene_script: macro ;\1: script pointer dw \1, 0 endm @@ -18,8 +18,8 @@ warp_def: macro map \4 endm -xy_trigger: macro -;\1: number: controlled by dotrigger/domaptrigger +coord_event: macro +;\1: number: controlled by setscene/setmapscene ;\2: y: top to bottom, starts at 0 ;\3: x: left to right, starts at 0 ;\4: script pointer @@ -28,32 +28,32 @@ xy_trigger: macro db $0, $0 endm -signpost: macro +bg_event: macro ;\1: y: top to bottom, starts at 0 ;\2: x: left to right, starts at 0 -;\3: function: a SIGNPOST_* constant +;\3: function: a BGEVENT_* constant ;\4: script pointer db \1, \2, \3 dw \4 endm -person_event: macro +object_event: macro ;\1: sprite: a SPRITE_* constant ;\2: y: top to bottom, starts at 0 ;\3: x: left to right, starts at 0 ;\4: movement function: a SPRITEMOVEDATA_* constant ;\5, \6: movement radius: y, x -;\7, \8: hour1 and hour2: control the hours a person_event is visible (0-23) -; * if hour1 < hour2, the person_event will only appear from hour1 to hour2 -; * if hour1 > hour2, the person_event will not appear from hour2 to hour1 -; * if hour1 == hour2, the person_event will always appear +;\7, \8: hour1 and hour2: control the hours an object_event is visible (0-23) +; * if hour1 < hour2, the object_event will only appear from hour1 to hour2 +; * if hour1 > hour2, the object_event will not appear from hour2 to hour1 +; * if hour1 == hour2, the object_event will always appear ; * if hour1 == -1, hour2 is treated as a time-of-day value: ; a combo of MORN, DAY, and/or NITE, or -1 to always appear ;\9: color: a PAL_NPC_* constant, or 0 for sprite default -;\10: function: a PERSONTYPE_* constant -;\11: sight range: applies to PERSONTYPE_TRAINER +;\10: function: a OBJECTTYPE_* constant +;\11: sight range: applies to OBJECTTYPE_TRAINER ;\12: script pointer -;\13: event flag: an EVENT_* constant, or 0 for always +;\13: event flag: an EVENT_* constant, or 0 to always appear db \1, \2 + 4, \3 + 4, \4 dn \5, \6 db \7, \8 @@ -101,7 +101,7 @@ ENDM stonetable: macro ;\1: warp id -;\2: person_event id +;\2: object_event id ;\3: script pointer db \1, \2 dw \3 diff --git a/macros/scripts/movement.asm b/macros/scripts/movement.asm index 28be559a3..2b0cedc69 100644 --- a/macros/scripts/movement.asm +++ b/macros/scripts/movement.asm @@ -122,14 +122,14 @@ fix_facing: macro db movement_fix_facing endm - enum movement_show_person ; $3c -show_person: macro - db movement_show_person + enum movement_show_object ; $3c +show_object: macro + db movement_show_object endm - enum movement_hide_person ; $3d -hide_person: macro - db movement_hide_person + enum movement_hide_object ; $3d +hide_object: macro + db movement_hide_object endm ; Sleep @@ -156,9 +156,9 @@ step_48: macro db \1 ; ??? endm - enum movement_remove_person ; $49 -remove_person: macro - db movement_remove_person + enum movement_remove_object ; $49 +remove_object: macro + db movement_remove_object endm enum movement_step_loop ; $4a diff --git a/macros/wram.asm b/macros/wram.asm index 7cead9158..e47e0a2f4 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -212,7 +212,7 @@ roam_struct: MACRO ENDM bugcontestwinner: macro -\1PersonID:: db +\1WinnerID:: db \1Mon:: db \1Score:: dw endm diff --git a/main.asm b/main.asm index 357b1223c..dbb838066 100644 --- a/main.asm +++ b/main.asm @@ -408,7 +408,7 @@ CheckSave:: ; 4cffe ld c, $0 ret -INCLUDE "data/maps/map_triggers.asm" +INCLUDE "data/maps/map_scenes.asm" _LoadMapPart:: ; 4d15b ld hl, wMisc diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index a39010e4e..54f9432d1 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -8,7 +8,7 @@ const_value set 2 const AZALEAGYM_GYM_GUY AzaleaGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -33,7 +33,7 @@ AzaleaGymBugsyScript: waitsfx setflag ENGINE_HIVEBADGE checkcode VAR_BADGES - scall AzaleaGymTriggerRockets + scall AzaleaGymActivateRockets .FightDone: checkevent EVENT_GOT_TM49_FURY_CUTTER iftrue .GotFuryCutter @@ -58,7 +58,7 @@ AzaleaGymBugsyScript: closetext end -AzaleaGymTriggerRockets: +AzaleaGymActivateRockets: if_equal 7, .RadioTowerRockets if_equal 6, .GoldenrodRockets end @@ -370,20 +370,20 @@ AzaleaGym_MapEventHeader: warp_def $f, $4, 5, AZALEA_TOWN warp_def $f, $5, 5, AZALEA_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 13, 3, SIGNPOST_READ, AzaleaGymStatue - signpost 13, 6, SIGNPOST_READ, AzaleaGymStatue + bg_event 13, 3, BGEVENT_READ, AzaleaGymStatue + bg_event 13, 6, BGEVENT_READ, AzaleaGymStatue -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1 - person_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerBug_catcherbenny, -1 - person_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherAl, -1 - person_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherJosh, -1 - person_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1 - person_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1 - person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1 + object_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1 + object_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBug_catcherbenny, -1 + object_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherAl, -1 + object_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherJosh, -1 + object_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1 + object_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1 + object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index 06044e78d..01abee35a 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -4,7 +4,7 @@ const_value set 2 const AZALEAMART_BUG_CATCHER AzaleaMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -54,14 +54,14 @@ AzaleaMart_MapEventHeader: warp_def $7, $2, 3, AZALEA_TOWN warp_def $7, $3, 3, AZALEA_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1 - person_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1 - person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1 + object_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1 + object_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1 diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm index bc09c2e09..f369c3bff 100644 --- a/maps/AzaleaPokecenter1F.asm +++ b/maps/AzaleaPokecenter1F.asm @@ -5,14 +5,14 @@ const_value set 2 const AZALEAPOKECENTER1F_POKEFAN_F AzaleaPokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - maptrigger .DummyTrigger + scene_script .DummyScene .MapCallbacks: db 0 -.DummyTrigger: +.DummyScene: end AzaleaPokecenter1FNurseScript: @@ -86,15 +86,15 @@ AzaleaPokecenter1F_MapEventHeader: warp_def $7, $4, 1, AZALEA_TOWN warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1 - person_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1 - person_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1 - person_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1 + object_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1 + object_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1 + object_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 90e387f46..cf576d81d 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -13,31 +13,31 @@ const_value set 2 const AZALEATOWN_KURT_OUTSIDE AzaleaTown_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 3 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 - maptrigger .DummyTrigger2 + scene_script .DummyScene0 + scene_script .DummyScene1 + scene_script .DummyScene2 .MapCallbacks: db 1 dbw MAPCALLBACK_NEWMAP, .Flypoint -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end -.DummyTrigger2: +.DummyScene2: end .Flypoint: setflag ENGINE_FLYPOINT_AZALEA return -AzaleaTownRivalBattleTrigger1: - moveperson AZALEATOWN_SILVER, $b, $b +AzaleaTownRivalBattleScene1: + moveobject AZALEATOWN_SILVER, $b, $b spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic @@ -47,7 +47,7 @@ AzaleaTownRivalBattleTrigger1: spriteface PLAYER, DOWN jump AzaleaTownRivalBattleScript -AzaleaTownRivalBattleTrigger2: +AzaleaTownRivalBattleScene2: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic @@ -102,7 +102,7 @@ AzaleaTownRivalBattleScript: applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement playsound SFX_EXIT_BUILDING disappear AZALEATOWN_SILVER - dotrigger $0 + setscene $0 waitsfx playmapmusic end @@ -155,7 +155,7 @@ WoosterScript: closetext end -AzaleaTownCelebiTrigger: +AzaleaTownCelebiScene: applymovement PLAYER, AzaleaTownPlayerLeavesKurtsHouseMovement opentext writetext AzaleaTownKurtText1 @@ -170,7 +170,7 @@ AzaleaTownCelebiTrigger: setflag ENGINE_HAVE_EXAMINED_GS_BALL clearevent EVENT_ILEX_FOREST_LASS setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS - dotrigger $0 + setscene $0 closetext end @@ -470,35 +470,35 @@ AzaleaTown_MapEventHeader: warp_def $a, $2, 3, ILEX_FOREST_AZALEA_GATE warp_def $b, $2, 4, ILEX_FOREST_AZALEA_GATE -.XYTriggers: +.CoordEvents: db 3 - xy_trigger 1, $a, $5, AzaleaTownRivalBattleTrigger1 - xy_trigger 1, $b, $5, AzaleaTownRivalBattleTrigger2 - xy_trigger 2, $6, $9, AzaleaTownCelebiTrigger + coord_event 1, $a, $5, AzaleaTownRivalBattleScene1 + coord_event 1, $b, $5, AzaleaTownRivalBattleScene2 + coord_event 2, $6, $9, AzaleaTownCelebiScene -.Signposts: +.BGEvents: db 9 - signpost 9, 19, SIGNPOST_READ, AzaleaTownSign - signpost 9, 10, SIGNPOST_READ, KurtsHouseSign - signpost 15, 14, SIGNPOST_READ, AzaleaGymSign - signpost 7, 29, SIGNPOST_READ, SlowpokeWellSign - signpost 13, 19, SIGNPOST_READ, CharcoalKilnSign - signpost 9, 16, SIGNPOST_READ, AzaleaTownPokecenterSign - signpost 5, 22, SIGNPOST_READ, AzaleaTownMartSign - signpost 9, 3, SIGNPOST_READ, AzaleaTownIlextForestSign - signpost 6, 31, SIGNPOST_ITEM, AzaleaTownHiddenFullHeal + bg_event 9, 19, BGEVENT_READ, AzaleaTownSign + bg_event 9, 10, BGEVENT_READ, KurtsHouseSign + bg_event 15, 14, BGEVENT_READ, AzaleaGymSign + bg_event 7, 29, BGEVENT_READ, SlowpokeWellSign + bg_event 13, 19, BGEVENT_READ, CharcoalKilnSign + bg_event 9, 16, BGEVENT_READ, AzaleaTownPokecenterSign + bg_event 5, 22, BGEVENT_READ, AzaleaTownMartSign + bg_event 9, 3, BGEVENT_READ, AzaleaTownIlextForestSign + bg_event 6, 31, BGEVENT_ITEM, AzaleaTownHiddenFullHeal -.PersonEvents: +.ObjectEvents: db 12 - person_event SPRITE_AZALEA_ROCKET, 9, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET - person_event SPRITE_GRAMPS, 9, 21, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1 - person_event SPRITE_TEACHER, 13, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1 - person_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1 - person_event SPRITE_SLOWPOKE, 17, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - person_event SPRITE_SLOWPOKE, 9, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - person_event SPRITE_SLOWPOKE, 9, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - person_event SPRITE_SLOWPOKE, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - person_event SPRITE_FRUIT_TREE, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WhiteApricornTree, -1 - person_event SPRITE_AZALEA_ROCKET, 10, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN - person_event SPRITE_AZALEA_ROCKET, 16, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownRocket2Script, EVENT_SLOWPOKE_WELL_ROCKETS - person_event SPRITE_KURT_OUTSIDE, 5, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT + object_event SPRITE_AZALEA_ROCKET, 9, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET + object_event SPRITE_GRAMPS, 9, 21, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1 + object_event SPRITE_TEACHER, 13, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1 + object_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1 + object_event SPRITE_SLOWPOKE, 17, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event SPRITE_SLOWPOKE, 9, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event SPRITE_SLOWPOKE, 9, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event SPRITE_SLOWPOKE, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event SPRITE_FRUIT_TREE, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1 + object_event SPRITE_AZALEA_ROCKET, 10, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN + object_event SPRITE_AZALEA_ROCKET, 16, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket2Script, EVENT_SLOWPOKE_WELL_ROCKETS + object_event SPRITE_KURT_OUTSIDE, 5, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index c6b188b8d..ad7708c96 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -6,15 +6,15 @@ const_value set 2 const BATTLETOWER1F_GRANNY BattleTower1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .Scene0 + scene_script .Scene1 .MapCallbacks: db 0 -.Trigger0: +.Scene0: writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS special BattleTowerAction iffalse .SkipEverything @@ -38,8 +38,8 @@ BattleTower1F_MapScriptHeader: writebyte BATTLETOWERACTION_06 special BattleTowerAction .SkipEverything: - dotrigger $1 -.Trigger1: + setscene $1 +.Scene1: end MapBattleTower1FSignpost0Script: @@ -81,10 +81,10 @@ Script_ChooseChallenge: ; 0x9e40f writetext Text_SaveBeforeEnteringBattleRoom yesorno iffalse Script_Menu_ChallengeExplanationCancel - dotrigger $0 + setscene $0 special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel - dotrigger $1 + setscene $1 writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags] special BattleTowerAction special BattleTowerRoomMenu @@ -105,9 +105,9 @@ Script_ResumeBattleTowerChallenge: special BattleTowerAction Script_WalkToBattleTowerElevator: musicfadeout MUSIC_NONE, 8 - domaptrigger BATTLE_TOWER_BATTLE_ROOM, $0 - domaptrigger BATTLE_TOWER_ELEVATOR, $0 - domaptrigger BATTLE_TOWER_HALLWAY, $0 + setmapscene BATTLE_TOWER_BATTLE_ROOM, $0 + setmapscene BATTLE_TOWER_ELEVATOR, $0 + setmapscene BATTLE_TOWER_HALLWAY, $0 follow BATTLETOWER1F_RECEPTIONIST, PLAYER applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator writebyte BATTLETOWERACTION_0A @@ -208,10 +208,10 @@ continue: writetext Text_SaveBeforeReentry yesorno iffalse Script_Menu_ChallengeExplanationCancel - dotrigger $0 + setscene $0 special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel - dotrigger $1 + setscene $1 writebyte BATTLETOWERACTION_06 special BattleTowerAction writebyte BATTLETOWERACTION_12 @@ -803,17 +803,17 @@ BattleTower1F_MapEventHeader: warp_def $9, $8, 4, BATTLE_TOWER_OUTSIDE warp_def $0, $7, 1, BATTLE_TOWER_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 6, 6, SIGNPOST_READ, MapBattleTower1FSignpost0Script + bg_event 6, 6, BGEVENT_READ, MapBattleTower1FSignpost0Script -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_RECEPTIONIST, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1 - person_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1 - person_event SPRITE_COOLTRAINER_F, 9, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1 - person_event SPRITE_BUG_CATCHER, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1 - person_event SPRITE_GRANNY, 3, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1 + object_event SPRITE_RECEPTIONIST, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1 + object_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1 + object_event SPRITE_COOLTRAINER_F, 9, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1 + object_event SPRITE_BUG_CATCHER, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1 + object_event SPRITE_GRANNY, 3, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 4f389e970..ffc4237f9 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -3,10 +3,10 @@ const_value set 2 const BATTLETOWERBATTLEROOM_RECEPTIONIST BattleTowerBattleRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .EnterBattleRoom - maptrigger .DummyTrigger + scene_script .EnterBattleRoom + scene_script .DummyScene .MapCallbacks: db 0 @@ -14,8 +14,8 @@ BattleTowerBattleRoom_MapScriptHeader: .EnterBattleRoom: ; 0x9f419 disappear BATTLETOWERBATTLEROOM_YOUNGSTER priorityjump Script_BattleRoom - dotrigger $1 -.DummyTrigger: + setscene $1 +.DummyScene: end Script_BattleRoom: ; 0x9f421 @@ -149,13 +149,13 @@ BattleTowerBattleRoom_MapEventHeader: warp_def $7, $3, 4, BATTLE_TOWER_HALLWAY warp_def $7, $4, 4, BATTLE_TOWER_HALLWAY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_YOUNGSTER, 0, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER - person_event SPRITE_RECEPTIONIST, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event SPRITE_YOUNGSTER, 0, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER + object_event SPRITE_RECEPTIONIST, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 4bd5b8e6f..c2d51f5fc 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -2,19 +2,19 @@ const_value set 2 const BATTLETOWERELEVATOR_RECEPTIONIST BattleTowerElevator_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .Scene0 + scene_script .Scene1 .MapCallbacks: db 0 -.Trigger0: +.Scene0: priorityjump .RideElevator - dotrigger $1 + setscene $1 -.Trigger1: +.Scene1: end .RideElevator: @@ -53,12 +53,12 @@ BattleTowerElevator_MapEventHeader: warp_def $3, $1, 1, BATTLE_TOWER_HALLWAY warp_def $3, $2, 1, BATTLE_TOWER_HALLWAY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1 + object_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index cc65fcbfd..dc60a0440 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -2,18 +2,18 @@ const_value set 2 const BATTLETOWERHALLWAY_RECEPTIONIST BattleTowerHallway_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .Scene0 + scene_script .Scene1 .MapCallbacks: db 0 -.Trigger0: +.Scene0: priorityjump .ChooseBattleRoom - dotrigger $1 -.Trigger1: + setscene $1 +.Scene1: end .ChooseBattleRoom: @@ -68,7 +68,7 @@ BattleTowerHallway_MapScriptHeader: jump .EnterBattleRoom .EnterBattleRoom: ; 0x9f61f - faceperson PLAYER, BATTLETOWERHALLWAY_RECEPTIONIST + faceobject PLAYER, BATTLETOWERHALLWAY_RECEPTIONIST opentext writetext Text_PleaseStepThisWay waitbutton @@ -91,12 +91,12 @@ BattleTowerHallway_MapEventHeader: warp_def $0, $d, 1, BATTLE_TOWER_BATTLE_ROOM warp_def $0, $f, 1, BATTLE_TOWER_BATTLE_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_RECEPTIONIST, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BattleTowerHallway_MapEventHeader, -1 + object_event SPRITE_RECEPTIONIST, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEventHeader, -1 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 4c38ed4e7..9cf15d915 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -5,7 +5,7 @@ const_value set 2 const BATTLETOWEROUTSIDE_LASS BattleTowerOutside_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -137,16 +137,16 @@ BattleTowerOutside_MapEventHeader: warp_def $9, $8, 1, BATTLE_TOWER_1F warp_def $9, $9, 2, BATTLE_TOWER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 10, 10, SIGNPOST_READ, MapBattleTowerOutsideSignpost0Script + bg_event 10, 10, BGEVENT_READ, MapBattleTowerOutsideSignpost0Script -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 - person_event SPRITE_BUENA, 11, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1 - person_event SPRITE_SAILOR, 18, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR - person_event SPRITE_LASS, 24, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 + object_event SPRITE_BUENA, 11, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1 + object_event SPRITE_SAILOR, 18, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + object_event SPRITE_LASS, 24, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index e6264e7c9..b8afadd08 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const BILLSHOUSE_GRAMPS BillsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -362,12 +362,12 @@ BillsHouse_MapEventHeader: warp_def $7, $2, 1, ROUTE_25 warp_def $7, $3, 1, ROUTE_25 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BillsGrandpa, -1 + object_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index c2b23c591..d0a52c88c 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -10,7 +10,7 @@ const_value set 2 const BLACKTHORNCITY_COOLTRAINER_F2 BlackthornCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -327,27 +327,27 @@ BlackthornCity_MapEventHeader: warp_def $9, $24, 2, ICE_PATH_1F warp_def $1, $14, 1, DRAGONS_DEN_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 7 - signpost 24, 34, SIGNPOST_READ, BlackthornCitySign - signpost 13, 17, SIGNPOST_READ, BlackthornGymSign - signpost 31, 7, SIGNPOST_READ, MoveDeletersHouseSign - signpost 3, 21, SIGNPOST_READ, DragonDensSign - signpost 25, 5, SIGNPOST_READ, BlackthornCityTrainerTips - signpost 29, 16, SIGNPOST_READ, BlackthornCityMartSign - signpost 29, 22, SIGNPOST_READ, BlackthornCityPokecenterSign + bg_event 24, 34, BGEVENT_READ, BlackthornCitySign + bg_event 13, 17, BGEVENT_READ, BlackthornGymSign + bg_event 31, 7, BGEVENT_READ, MoveDeletersHouseSign + bg_event 3, 21, BGEVENT_READ, DragonDensSign + bg_event 25, 5, BGEVENT_READ, BlackthornCityTrainerTips + bg_event 29, 16, BGEVENT_READ, BlackthornCityMartSign + bg_event 29, 22, BGEVENT_READ, BlackthornCityPokecenterSign -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_SUPER_NERD, 12, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM - person_event SPRITE_SUPER_NERD, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM - person_event SPRITE_GRAMPS, 2, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN - person_event SPRITE_GRAMPS, 2, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN - person_event SPRITE_BLACK_BELT, 31, 24, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BlackthornBlackBeltScript, -1 - person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1 - person_event SPRITE_YOUNGSTER, 15, 13, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornYoungsterScript, -1 - person_event SPRITE_YOUNGSTER, 20, 22, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY - person_event SPRITE_COOLTRAINER_F, 19, 35, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BlackthornCooltrainerF2Script, -1 + object_event SPRITE_SUPER_NERD, 12, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM + object_event SPRITE_SUPER_NERD, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM + object_event SPRITE_GRAMPS, 2, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN + object_event SPRITE_GRAMPS, 2, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN + object_event SPRITE_BLACK_BELT, 31, 24, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornBlackBeltScript, -1 + object_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1 + object_event SPRITE_YOUNGSTER, 15, 13, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornYoungsterScript, -1 + object_event SPRITE_YOUNGSTER, 20, 22, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY + object_event SPRITE_COOLTRAINER_F, 19, 35, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF2Script, -1 diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 7217e1050..3c2619988 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const BLACKTHORNDRAGONSPEECHHOUSE_EKANS BlackthornDragonSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -56,13 +56,13 @@ BlackthornDragonSpeechHouse_MapEventHeader: warp_def $7, $2, 2, BLACKTHORN_CITY warp_def $7, $3, 2, BLACKTHORN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1 - person_event SPRITE_EKANS, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1 + object_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1 + object_event SPRITE_EKANS, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1 diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index bb69914d4..98b67537b 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const BLACKTHORNEMYSHOUSE_EMY BlackthornEmysHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -28,14 +28,14 @@ BlackthornEmysHouse_MapEventHeader: warp_def $7, $2, 3, BLACKTHORN_CITY warp_def $7, $3, 3, BLACKTHORN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, EmysHouseBookshelf - signpost 1, 1, SIGNPOST_READ, EmysHouseBookshelf + bg_event 1, 0, BGEVENT_READ, EmysHouseBookshelf + bg_event 1, 1, BGEVENT_READ, EmysHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_LASS, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Emy, -1 + object_event SPRITE_LASS, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 651d7e7ec..714ea46d3 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -6,7 +6,7 @@ const_value set 2 const BLACKTHORNGYM1F_GYM_GUY BlackthornGym1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -400,18 +400,18 @@ BlackthornGym1F_MapEventHeader: warp_def $7, $7, 4, BLACKTHORN_GYM_2F warp_def $6, $7, 5, BLACKTHORN_GYM_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 15, 3, SIGNPOST_READ, BlackthornGymStatue - signpost 15, 6, SIGNPOST_READ, BlackthornGymStatue + bg_event 15, 3, BGEVENT_READ, BlackthornGymStatue + bg_event 15, 6, BGEVENT_READ, BlackthornGymStatue -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_CLAIR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BlackthornGymClairScript, -1 - person_event SPRITE_COOLTRAINER_M, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermMike, -1 - person_event SPRITE_COOLTRAINER_M, 14, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1 - person_event SPRITE_COOLTRAINER_F, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1 - person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1 + object_event SPRITE_CLAIR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -1 + object_event SPRITE_COOLTRAINER_M, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1 + object_event SPRITE_COOLTRAINER_M, 14, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1 + object_event SPRITE_COOLTRAINER_F, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1 + object_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 3dd4a4d45..a9ee60bef 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -9,7 +9,7 @@ const_value set 2 const BLACKTHORNGYM2F_BOULDER6 BlackthornGym2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -139,19 +139,19 @@ BlackthornGym2F_MapEventHeader: warp_def $7, $8, 6, BLACKTHORN_GYM_1F ; hole warp_def $3, $8, 7, BLACKTHORN_GYM_1F ; hole -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 8 - person_event SPRITE_COOLTRAINER_M, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainermCody, -1 - person_event SPRITE_COOLTRAINER_F, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1 - person_event SPRITE_BOULDER, 2, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1 - person_event SPRITE_BOULDER, 3, 2, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2 - person_event SPRITE_BOULDER, 16, 6, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3 - person_event SPRITE_BOULDER, 3, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 - person_event SPRITE_BOULDER, 1, 6, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 - person_event SPRITE_BOULDER, 14, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 + object_event SPRITE_COOLTRAINER_M, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermCody, -1 + object_event SPRITE_COOLTRAINER_F, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1 + object_event SPRITE_BOULDER, 2, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1 + object_event SPRITE_BOULDER, 3, 2, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2 + object_event SPRITE_BOULDER, 16, 6, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3 + object_event SPRITE_BOULDER, 3, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 + object_event SPRITE_BOULDER, 1, 6, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 + object_event SPRITE_BOULDER, 14, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index be7987a76..ac350c45d 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -4,7 +4,7 @@ const_value set 2 const BLACKTHORNMART_BLACK_BELT BlackthornMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -55,14 +55,14 @@ BlackthornMart_MapEventHeader: warp_def $7, $2, 4, BLACKTHORN_CITY warp_def $7, $3, 4, BLACKTHORN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1 - person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1 - person_event SPRITE_BLACK_BELT, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1 + object_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1 + object_event SPRITE_BLACK_BELT, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1 diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm index b235d6143..3f6c76ffe 100644 --- a/maps/BlackthornPokecenter1F.asm +++ b/maps/BlackthornPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const BLACKTHORNPOKECENTER1F_COOLTRAINER_M BlackthornPokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -59,15 +59,15 @@ BlackthornPokecenter1F_MapEventHeader: warp_def $7, $4, 5, BLACKTHORN_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1 - person_event SPRITE_GENTLEMAN, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1 - person_event SPRITE_TWIN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1 - person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BlackthornPokecenter1FCooltrainerMScript, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1 + object_event SPRITE_GENTLEMAN, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1 + object_event SPRITE_TWIN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1 + object_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FCooltrainerMScript, -1 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 58bc77983..367b255b8 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const BLUESHOUSE_DAISY BluesHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -153,12 +153,12 @@ BluesHouse_MapEventHeader: warp_def $7, $2, 2, PALLET_TOWN warp_def $7, $3, 2, PALLET_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_DAISY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DaisyScript, -1 + object_event SPRITE_DAISY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1 diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index c1e09e6ee..8ac5547de 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -2,10 +2,10 @@ const_value set 2 const BRUNOSROOM_BRUNO BrunosRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .LockDoor - maptrigger .DummyTrigger + scene_script .LockDoor + scene_script .DummyScene .MapCallbacks: db 1 @@ -15,7 +15,7 @@ BrunosRoom_MapScriptHeader: priorityjump .BrunosDoorLocksBehindYou end -.DummyTrigger: +.DummyScene: end .BrunosRoomDoors: @@ -37,7 +37,7 @@ BrunosRoom_MapScriptHeader: changeblock $4, $e, $2a reloadmappart closetext - dotrigger $1 + setscene $1 setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -135,12 +135,12 @@ BrunosRoom_MapEventHeader: warp_def $2, $4, 1, KARENS_ROOM warp_def $2, $5, 2, KARENS_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_BRUNO, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, BrunoScript_Battle, -1 + object_event SPRITE_BRUNO, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index b9c11593b..25adf9358 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -6,24 +6,24 @@ const_value set 2 const BURNEDTOWER1F_POKE_BALL BurnedTower1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 3 - maptrigger .EusineTrigger - maptrigger .DummyTrigger1 - maptrigger .DummyTrigger2 + scene_script .EusineScene + scene_script .DummyScene1 + scene_script .DummyScene2 .MapCallbacks: db 1 dbw MAPCALLBACK_TILES, .HoleAndLadder -.EusineTrigger: +.EusineScene: priorityjump .MeetEusine end -.DummyTrigger1: +.DummyScene1: end -.DummyTrigger2: +.DummyScene2: end .HoleAndLadder: @@ -45,8 +45,8 @@ BurnedTower1F_MapScriptHeader: writetext BurnedTower1FEusineIntroText waitbutton closetext - moveperson BURNEDTOWER1F_EUSINE, $9, $e - dotrigger $1 + moveobject BURNEDTOWER1F_EUSINE, $9, $e + setscene $1 end BurnedTowerRivalBattleScript: @@ -98,7 +98,7 @@ BurnedTowerRivalBattleScript: writetext BurnedTowerSilver_AfterText1 waitbutton closetext - dotrigger $2 + setscene $2 setevent EVENT_RIVAL_BURNED_TOWER special Special_FadeOutMusic pause 15 @@ -300,19 +300,19 @@ BurnedTower1F_MapEventHeader: warp_def $e, $f, 5, BURNED_TOWER_B1F warp_def $f, $7, 6, BURNED_TOWER_B1F -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 1, $9, $b, BurnedTowerRivalBattleScript + coord_event 1, $9, $b, BurnedTowerRivalBattleScript -.Signposts: +.BGEvents: db 2 - signpost 7, 8, SIGNPOST_ITEM, BurnedTower1FHiddenEther - signpost 11, 13, SIGNPOST_ITEM, BurnedTower1FHiddenUltraBall + bg_event 7, 8, BGEVENT_ITEM, BurnedTower1FHiddenEther + bg_event 11, 13, BGEVENT_ITEM, BurnedTower1FHiddenUltraBall -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_ROCK, 4, 15, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BurnedTower1FRock, -1 - person_event SPRITE_SUPER_NERD, 12, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE - person_event SPRITE_SILVER, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER - person_event SPRITE_MORTY, 14, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY - person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP + object_event SPRITE_ROCK, 4, 15, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1 + object_event SPRITE_SUPER_NERD, 12, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE + object_event SPRITE_SILVER, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER + object_event SPRITE_MORTY, 14, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY + object_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index d46f633f7..0946a43d8 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -10,19 +10,19 @@ const_value set 2 const BURNEDTOWERB1F_EUSINE BurnedTowerB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 dbw MAPCALLBACK_TILES, .LadderCallback -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end .LadderCallback: @@ -81,11 +81,11 @@ ReleaseTheBeasts: disappear BURNEDTOWERB1F_SUICUNE1 waitsfx special RestartMapMusic - dotrigger $1 + setscene $1 setevent EVENT_RELEASED_THE_BEASTS special InitRoamMons - domaptrigger ECRUTEAK_GYM, $1 - domaptrigger CIANWOOD_CITY, $1 + setmapscene ECRUTEAK_GYM, $1 + setmapscene CIANWOOD_CITY, $1 clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY setevent EVENT_ECRUTEAK_GYM_GRAMPS clearevent EVENT_ECRUTEAK_CITY_GRAMPS @@ -96,7 +96,7 @@ ReleaseTheBeasts: changeblock $6, $e, $1b reloadmappart closetext - dotrigger $1 + setscene $1 end BurnedTowerB1FEusine: @@ -248,21 +248,21 @@ BurnedTowerB1F_MapEventHeader: warp_def $e, $11, 12, BURNED_TOWER_1F warp_def $f, $7, 14, BURNED_TOWER_1F -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $6, $a, ReleaseTheBeasts + coord_event 0, $6, $a, ReleaseTheBeasts -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_BOULDER, 8, 17, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1 - person_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 - person_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 - person_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 - person_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 - person_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 - person_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 - person_event SPRITE_POKE_BALL, 4, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE - person_event SPRITE_SUPER_NERD, 12, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BurnedTowerB1FEusine, EVENT_EUSINE_IN_BURNED_TOWER + object_event SPRITE_BOULDER, 8, 17, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1 + object_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + object_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + object_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + object_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + object_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + object_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + object_event SPRITE_POKE_BALL, 4, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE + object_event SPRITE_SUPER_NERD, 12, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FEusine, EVENT_EUSINE_IN_BURNED_TOWER diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 881e43281..7751c69ff 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -6,7 +6,7 @@ const_value set 2 const CELADONCAFE_TEACHER CeladonCafe_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -216,18 +216,18 @@ CeladonCafe_MapEventHeader: warp_def $7, $6, 9, CELADON_CITY warp_def $7, $7, 9, CELADON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 5, SIGNPOST_READ, EatathonContestPoster - signpost 1, 7, SIGNPOST_READ, CeladonCafeTrashcan + bg_event 0, 5, BGEVENT_READ, EatathonContestPoster + bg_event 1, 7, BGEVENT_READ, CeladonCafeTrashcan -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_SUPER_NERD, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CeladonCafeChef, -1 - person_event SPRITE_FISHER, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonCafeFisher1, -1 - person_event SPRITE_FISHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonCafeFisher2, -1 - person_event SPRITE_FISHER, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonCafeFisher3, -1 - person_event SPRITE_TEACHER, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonCafeTeacher, -1 + object_event SPRITE_SUPER_NERD, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCafeChef, -1 + object_event SPRITE_FISHER, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher1, -1 + object_event SPRITE_FISHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher2, -1 + object_event SPRITE_FISHER, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher3, -1 + object_event SPRITE_TEACHER, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeTeacher, -1 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 14b1a2d70..680875e42 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -10,7 +10,7 @@ const_value set 2 const CELADONCITY_LASS CeladonCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -250,28 +250,28 @@ CeladonCity_MapEventHeader: warp_def $1d, $a, 1, CELADON_GYM warp_def $1d, $19, 1, CELADON_CAFE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 8 - signpost 21, 23, SIGNPOST_READ, CeladonCitySign - signpost 31, 11, SIGNPOST_READ, CeladonGymSign - signpost 9, 6, SIGNPOST_READ, CeladonCityDeptStoreSign - signpost 9, 13, SIGNPOST_READ, CeladonCityMansionSign - signpost 21, 19, SIGNPOST_READ, CeladonCityGameCornerSign - signpost 21, 29, SIGNPOST_READ, CeladonCityTrainerTips - signpost 9, 30, SIGNPOST_READ, CeladonCityPokecenterSign - signpost 21, 37, SIGNPOST_ITEM, CeladonCityHiddenPpUp + bg_event 21, 23, BGEVENT_READ, CeladonCitySign + bg_event 31, 11, BGEVENT_READ, CeladonGymSign + bg_event 9, 6, BGEVENT_READ, CeladonCityDeptStoreSign + bg_event 9, 13, BGEVENT_READ, CeladonCityMansionSign + bg_event 21, 19, BGEVENT_READ, CeladonCityGameCornerSign + bg_event 21, 29, BGEVENT_READ, CeladonCityTrainerTips + bg_event 9, 30, BGEVENT_READ, CeladonCityPokecenterSign + bg_event 21, 37, BGEVENT_ITEM, CeladonCityHiddenPpUp -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_FISHER, 11, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonCityFisherScript, -1 - person_event SPRITE_POLIWAG, 11, 27, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1 - person_event SPRITE_TEACHER, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonCityTeacher1Script, -1 - person_event SPRITE_GRAMPS, 16, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CeladonCityGramps1Script, -1 - person_event SPRITE_GRAMPS, 31, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonCityGramps2Script, -1 - person_event SPRITE_YOUNGSTER, 13, 18, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonCityYoungster1Script, -1 - person_event SPRITE_YOUNGSTER, 33, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonCityYoungster2Script, -1 - person_event SPRITE_TEACHER, 14, 6, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1 - person_event SPRITE_LASS, 22, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonCityLassScript, -1 + object_event SPRITE_FISHER, 11, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityFisherScript, -1 + object_event SPRITE_POLIWAG, 11, 27, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1 + object_event SPRITE_TEACHER, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher1Script, -1 + object_event SPRITE_GRAMPS, 16, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps1Script, -1 + object_event SPRITE_GRAMPS, 31, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps2Script, -1 + object_event SPRITE_YOUNGSTER, 13, 18, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster1Script, -1 + object_event SPRITE_YOUNGSTER, 33, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster2Script, -1 + object_event SPRITE_TEACHER, 14, 6, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1 + object_event SPRITE_LASS, 22, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityLassScript, -1 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index d8d1a1411..6a1a7e358 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -4,7 +4,7 @@ const_value set 2 const CELADONDEPTSTORE1F_TEACHER CeladonDeptStore1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -84,16 +84,16 @@ CeladonDeptStore1F_MapEventHeader: warp_def $0, $f, 2, CELADON_DEPT_STORE_2F warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, CeladonDeptStore1FDirectory - signpost 0, 3, SIGNPOST_READ, CeladonDeptStore1FElevatorButton + bg_event 0, 14, BGEVENT_READ, CeladonDeptStore1FDirectory + bg_event 0, 3, BGEVENT_READ, CeladonDeptStore1FElevatorButton -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1 - person_event SPRITE_GENTLEMAN, 4, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1 - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1 + object_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1 + object_event SPRITE_GENTLEMAN, 4, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1 + object_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index c056a7143..916b89efb 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -5,7 +5,7 @@ const_value set 2 const CELADONDEPTSTORE2F_YOUNGSTER CeladonDeptStore2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -78,17 +78,17 @@ CeladonDeptStore2F_MapEventHeader: warp_def $0, $f, 3, CELADON_DEPT_STORE_1F warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, CeladonDeptStore2FDirectory - signpost 0, 3, SIGNPOST_READ, CeladonDeptStore2FElevatorButton + bg_event 0, 14, BGEVENT_READ, CeladonDeptStore2FDirectory + bg_event 0, 3, BGEVENT_READ, CeladonDeptStore2FElevatorButton -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1 - person_event SPRITE_CLERK, 5, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1 - person_event SPRITE_POKEFAN_M, 2, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1 - person_event SPRITE_YOUNGSTER, 2, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1 + object_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1 + object_event SPRITE_CLERK, 5, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1 + object_event SPRITE_POKEFAN_M, 2, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1 + object_event SPRITE_YOUNGSTER, 2, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 72f4f26ea..38510ec1a 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -6,7 +6,7 @@ const_value set 2 const CELADONDEPTSTORE3F_SUPER_NERD CeladonDeptStore3F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -104,18 +104,18 @@ CeladonDeptStore3F_MapEventHeader: warp_def $0, $f, 2, CELADON_DEPT_STORE_4F warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, CeladonDeptStore3FDirectory - signpost 0, 3, SIGNPOST_READ, CeladonDeptStore3FElevatorButton + bg_event 0, 14, BGEVENT_READ, CeladonDeptStore3FDirectory + bg_event 0, 3, BGEVENT_READ, CeladonDeptStore3FElevatorButton -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_CLERK, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1 - person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1 - person_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1 - person_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1 - person_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1 + object_event SPRITE_CLERK, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1 + object_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1 + object_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1 + object_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1 + object_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index a31c98015..fe3942113 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -4,7 +4,7 @@ const_value set 2 const CELADONDEPTSTORE4F_YOUNGSTER CeladonDeptStore4F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -60,16 +60,16 @@ CeladonDeptStore4F_MapEventHeader: warp_def $0, $f, 2, CELADON_DEPT_STORE_3F warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, CeladonDeptStore4FDirectory - signpost 0, 3, SIGNPOST_READ, CeladonDeptStore4FElevatorButton + bg_event 0, 14, BGEVENT_READ, CeladonDeptStore4FDirectory + bg_event 0, 3, BGEVENT_READ, CeladonDeptStore4FElevatorButton -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1 - person_event SPRITE_SUPER_NERD, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1 - person_event SPRITE_YOUNGSTER, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1 + object_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1 + object_event SPRITE_SUPER_NERD, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1 + object_event SPRITE_YOUNGSTER, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index d111c0c2c..eda2ec693 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -6,7 +6,7 @@ const_value set 2 const CELADONDEPTSTORE5F_TEACHER CeladonDeptStore5F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -81,18 +81,18 @@ CeladonDeptStore5F_MapEventHeader: warp_def $0, $f, 1, CELADON_DEPT_STORE_6F warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, CeladonDeptStore5FDirectory - signpost 0, 3, SIGNPOST_READ, CeladonDeptStore5FElevatorButton + bg_event 0, 14, BGEVENT_READ, CeladonDeptStore5FDirectory + bg_event 0, 3, BGEVENT_READ, CeladonDeptStore5FElevatorButton -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_CLERK, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x71004, -1 - person_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1 - person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1 - person_event SPRITE_SAILOR, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1 - person_event SPRITE_TEACHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1 + object_event SPRITE_CLERK, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x71004, -1 + object_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1 + object_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1 + object_event SPRITE_SAILOR, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1 + object_event SPRITE_TEACHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 88f6b756e..256b8541f 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -3,7 +3,7 @@ const_value set 2 const CELADONDEPTSTORE6F_YOUNGSTER CeladonDeptStore6F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -156,19 +156,19 @@ CeladonDeptStore6F_MapEventHeader: warp_def $0, $f, 2, CELADON_DEPT_STORE_5F warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 0, 14, SIGNPOST_READ, CeladonDeptStore6FDirectory - signpost 0, 3, SIGNPOST_READ, CeladonDeptStore1FElevatorButton - signpost 1, 8, SIGNPOST_UP, CeladonDeptStore6FVendingMachine - signpost 1, 9, SIGNPOST_UP, CeladonDeptStore6FVendingMachine - signpost 1, 10, SIGNPOST_UP, CeladonDeptStore6FVendingMachine - signpost 1, 11, SIGNPOST_UP, CeladonDeptStore6FVendingMachine + bg_event 0, 14, BGEVENT_READ, CeladonDeptStore6FDirectory + bg_event 0, 3, BGEVENT_READ, CeladonDeptStore1FElevatorButton + bg_event 1, 8, BGEVENT_UP, CeladonDeptStore6FVendingMachine + bg_event 1, 9, BGEVENT_UP, CeladonDeptStore6FVendingMachine + bg_event 1, 10, BGEVENT_UP, CeladonDeptStore6FVendingMachine + bg_event 1, 11, BGEVENT_UP, CeladonDeptStore6FVendingMachine -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_SUPER_NERD, 2, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1 - person_event SPRITE_YOUNGSTER, 5, 12, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1 + object_event SPRITE_SUPER_NERD, 2, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1 + object_event SPRITE_YOUNGSTER, 5, 12, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1 diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index 5af977699..44c37ae9f 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -1,5 +1,5 @@ CeladonDeptStoreElevator_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -36,12 +36,12 @@ CeladonDeptStoreElevator_MapEventHeader: warp_def $3, $1, -1, CELADON_DEPT_STORE_1F warp_def $3, $2, -1, CELADON_DEPT_STORE_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 0, 3, SIGNPOST_READ, CeladonDeptStoreElevatorScript + bg_event 0, 3, BGEVENT_READ, CeladonDeptStoreElevatorScript -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 78e7c9e56..5bd122023 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -10,7 +10,7 @@ const_value set 2 const CELADONGAMECORNER_GRAMPS CeladonGameCorner_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -290,58 +290,58 @@ CeladonGameCorner_MapEventHeader: warp_def $d, $e, 6, CELADON_CITY warp_def $d, $f, 6, CELADON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 38 - signpost 6, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript - signpost 7, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript - signpost 8, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript - signpost 9, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript - signpost 10, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript - signpost 11, 1, SIGNPOST_LEFT, CeladonGameCornerCardFlipScript - signpost 6, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript - signpost 7, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript - signpost 8, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript - signpost 9, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost9Script - signpost 10, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript - signpost 11, 6, SIGNPOST_RIGHT, CeladonGameCornerCardFlipScript - signpost 6, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript - signpost 7, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript - signpost 8, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript - signpost 9, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript - signpost 10, 7, SIGNPOST_READ, CeladonGameCornerSlotMachineScript - signpost 11, 7, SIGNPOST_LEFT, CeladonGameCornerLuckySlotMachineScript - signpost 6, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript - signpost 7, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript - signpost 8, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript - signpost 9, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript - signpost 10, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript - signpost 11, 12, SIGNPOST_RIGHT, CeladonGameCornerLuckySlotMachineScript - signpost 6, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript - signpost 7, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript - signpost 8, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript - signpost 9, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript - signpost 10, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript - signpost 11, 13, SIGNPOST_LEFT, CeladonGameCornerLuckySlotMachineScript - signpost 6, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript - signpost 7, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript - signpost 8, 18, SIGNPOST_READ, CeladonGameCornerLighterScript - signpost 9, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript - signpost 10, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript - signpost 11, 18, SIGNPOST_RIGHT, CeladonGameCornerLuckySlotMachineScript - signpost 0, 15, SIGNPOST_READ, CeladonGameCornerPoster1Script - signpost 0, 9, SIGNPOST_READ, CeladonGameCornerPoster2Script + bg_event 6, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 7, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 8, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 9, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 10, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 11, 1, BGEVENT_LEFT, CeladonGameCornerCardFlipScript + bg_event 6, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 7, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 8, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 9, 6, BGEVENT_READ, MapCeladonGameCornerSignpost9Script + bg_event 10, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 11, 6, BGEVENT_RIGHT, CeladonGameCornerCardFlipScript + bg_event 6, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 8, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 9, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 10, 7, BGEVENT_READ, CeladonGameCornerSlotMachineScript + bg_event 11, 7, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript + bg_event 6, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 8, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 9, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 10, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 11, 12, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript + bg_event 6, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 8, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 9, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 10, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 11, 13, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript + bg_event 6, 18, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 18, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 8, 18, BGEVENT_READ, CeladonGameCornerLighterScript + bg_event 9, 18, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 10, 18, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 11, 18, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript + bg_event 0, 15, BGEVENT_READ, CeladonGameCornerPoster1Script + bg_event 0, 9, BGEVENT_READ, CeladonGameCornerPoster2Script -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_CLERK, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1 - person_event SPRITE_RECEPTIONIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1 - person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1 - person_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1 - person_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1 - person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 - person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 - person_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGymGuyScript, -1 - person_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1 + object_event SPRITE_CLERK, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1 + object_event SPRITE_RECEPTIONIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1 + object_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1 + object_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1 + object_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1 + object_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 + object_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 + object_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGymGuyScript, -1 + object_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1 diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index cd817457a..b23379878 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -3,7 +3,7 @@ const_value set 2 const CELADONGAMECORNERPRIZEROOM_PHARMACIST CeladonGameCornerPrizeRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -278,15 +278,15 @@ CeladonGameCornerPrizeRoom_MapEventHeader: warp_def $5, $2, 7, CELADON_CITY warp_def $5, $3, 7, CELADON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 2, SIGNPOST_READ, GoldenrodGameCornerTMVendor - signpost 1, 4, SIGNPOST_READ, GoldenrodGameCornerPokemonVendor + bg_event 1, 2, BGEVENT_READ, GoldenrodGameCornerTMVendor + bg_event 1, 4, BGEVENT_READ, GoldenrodGameCornerPokemonVendor -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_GENTLEMAN, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1 - person_event SPRITE_PHARMACIST, 4, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1 + object_event SPRITE_GENTLEMAN, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1 + object_event SPRITE_PHARMACIST, 4, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 88fe6d8e0..4cff86dfc 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -7,7 +7,7 @@ const_value set 2 const CELADONGYM_TWIN2 CeladonGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -276,19 +276,19 @@ CeladonGym_MapEventHeader: warp_def $11, $4, 8, CELADON_CITY warp_def $11, $5, 8, CELADON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 15, 3, SIGNPOST_READ, CeladonGymStatue - signpost 15, 6, SIGNPOST_READ, CeladonGymStatue + bg_event 15, 3, BGEVENT_READ, CeladonGymStatue + bg_event 15, 6, BGEVENT_READ, CeladonGymStatue -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_ERIKA, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1 - person_event SPRITE_LASS, 8, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerLassMichelle, -1 - person_event SPRITE_LASS, 8, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerPicnickerTanya, -1 - person_event SPRITE_BUENA, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerBeautyJulia, -1 - person_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1 - person_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1 + object_event SPRITE_ERIKA, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1 + object_event SPRITE_LASS, 8, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1 + object_event SPRITE_LASS, 8, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1 + object_event SPRITE_BUENA, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1 + object_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1 + object_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index ee5a5659a..452ba96e8 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -5,7 +5,7 @@ const_value set 2 const CELADONMANSION1F_GROWLITHE2 CeladonMansion1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -86,18 +86,18 @@ CeladonMansion1F_MapEventHeader: warp_def $0, $0, 1, CELADON_MANSION_2F warp_def $0, $7, 4, CELADON_MANSION_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 8, 5, SIGNPOST_UP, CeladonMansionManagersSuiteSign - signpost 3, 0, SIGNPOST_READ, CeladonMansion1fBookshelf - signpost 3, 2, SIGNPOST_READ, CeladonMansion1fBookshelf + bg_event 8, 5, BGEVENT_UP, CeladonMansionManagersSuiteSign + bg_event 3, 0, BGEVENT_READ, CeladonMansion1fBookshelf + bg_event 3, 2, BGEVENT_READ, CeladonMansion1fBookshelf -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_GRANNY, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonMansionManager, -1 - person_event SPRITE_GROWLITHE, 6, 2, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1 - person_event SPRITE_CLEFAIRY, 4, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1 - person_event SPRITE_GROWLITHE, 4, 4, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1 + object_event SPRITE_GRANNY, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1 + object_event SPRITE_GROWLITHE, 6, 2, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1 + object_event SPRITE_CLEFAIRY, 4, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1 + object_event SPRITE_GROWLITHE, 4, 4, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1 diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index fbe54d617..d63ef1be6 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -1,5 +1,5 @@ CeladonMansion2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -60,14 +60,14 @@ CeladonMansion2F_MapEventHeader: warp_def $0, $6, 3, CELADON_MANSION_3F warp_def $0, $7, 5, CELADON_MANSION_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 3, 0, SIGNPOST_READ, CeladonMansion2FComputer - signpost 8, 5, SIGNPOST_UP, CeladonMansion2FSign - signpost 3, 2, SIGNPOST_READ, CeladonMansion2FBookshelf + bg_event 3, 0, BGEVENT_READ, CeladonMansion2FComputer + bg_event 8, 5, BGEVENT_UP, CeladonMansion2FSign + bg_event 3, 2, BGEVENT_READ, CeladonMansion2FBookshelf -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 60e636cae..dfa41c582 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -5,7 +5,7 @@ const_value set 2 const CELADONMANSION3F_FISHER CeladonMansion3F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -200,19 +200,19 @@ CeladonMansion3F_MapEventHeader: warp_def $0, $6, 3, CELADON_MANSION_2F warp_def $0, $7, 2, CELADON_MANSION_ROOF -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 8, 5, SIGNPOST_UP, MapCeladonMansion3FSignpost0Script - signpost 3, 4, SIGNPOST_UP, MapCeladonMansion3FSignpost1Script - signpost 6, 1, SIGNPOST_UP, MapCeladonMansion3FSignpost2Script - signpost 3, 1, SIGNPOST_UP, MapCeladonMansion3FSignpost3Script + bg_event 8, 5, BGEVENT_UP, MapCeladonMansion3FSignpost0Script + bg_event 3, 4, BGEVENT_UP, MapCeladonMansion3FSignpost1Script + bg_event 6, 1, BGEVENT_UP, MapCeladonMansion3FSignpost2Script + bg_event 3, 1, BGEVENT_UP, MapCeladonMansion3FSignpost3Script -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_COOLTRAINER_M, 6, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1 - person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1 - person_event SPRITE_SUPER_NERD, 7, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1 - person_event SPRITE_FISHER, 4, 0, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1 + object_event SPRITE_COOLTRAINER_M, 6, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1 + object_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1 + object_event SPRITE_SUPER_NERD, 7, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1 + object_event SPRITE_FISHER, 4, 0, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1 diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index 8857e93c9..8458a9d87 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -2,7 +2,7 @@ const_value set 2 const CELADONMANSIONROOF_FISHER CeladonMansionRoof_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -43,13 +43,13 @@ CeladonMansionRoof_MapEventHeader: warp_def $1, $6, 4, CELADON_MANSION_3F warp_def $5, $2, 1, CELADON_MANSION_ROOF_HOUSE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 1, 6, SIGNPOST_LEFT, MapCeladonMansionRoofSignpost0Script + bg_event 1, 6, BGEVENT_LEFT, MapCeladonMansionRoofSignpost0Script -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHER, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1 + object_event SPRITE_FISHER, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 73a1cbadf..4cb750df7 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const CELADONMANSIONROOFHOUSE_PHARMACIST CeladonMansionRoofHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -125,12 +125,12 @@ CeladonMansionRoofHouse_MapEventHeader: warp_def $7, $2, 3, CELADON_MANSION_ROOF warp_def $7, $3, 3, CELADON_MANSION_ROOF -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_PHARMACIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1 + object_event SPRITE_PHARMACIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1 diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 086de9a86..32fdf2010 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -6,7 +6,7 @@ const_value set 2 const CELADONPOKECENTER1F_EUSINE CeladonPokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -155,16 +155,16 @@ CeladonPokecenter1F_MapEventHeader: warp_def $7, $4, 5, CELADON_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x71e22, -1 - person_event SPRITE_GENTLEMAN, 5, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1 - person_event SPRITE_PHARMACIST, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1 - person_event SPRITE_COOLTRAINER_F, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonPokecenter1FCooltrainerFScript, -1 - person_event SPRITE_SUPER_NERD, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x71e22, -1 + object_event SPRITE_GENTLEMAN, 5, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1 + object_event SPRITE_PHARMACIST, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1 + object_event SPRITE_COOLTRAINER_F, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FCooltrainerFScript, -1 + object_event SPRITE_SUPER_NERD, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH diff --git a/maps/CeladonPokecenter2FBeta.asm b/maps/CeladonPokecenter2FBeta.asm index 70b3cfbd6..10a192b93 100644 --- a/maps/CeladonPokecenter2FBeta.asm +++ b/maps/CeladonPokecenter2FBeta.asm @@ -1,5 +1,5 @@ CeladonPokecenter2FBeta_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -13,11 +13,11 @@ CeladonPokecenter2FBeta_MapEventHeader: db 1 warp_def $7, $0, 3, CELADON_POKECENTER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 55b3ff6d7..fc0bd60f6 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -7,7 +7,7 @@ const_value set 2 const CERULEANCITY_YOUNGSTER CeruleanCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -288,26 +288,26 @@ CeruleanCity_MapEventHeader: warp_def $17, $1e, 1, CERULEAN_GYM warp_def $1d, $19, 2, CERULEAN_MART -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 9 - signpost 23, 23, SIGNPOST_READ, CeruleanCitySign - signpost 25, 27, SIGNPOST_READ, CeruleanGymSign - signpost 29, 11, SIGNPOST_READ, CeruleanBikeShopSign - signpost 17, 25, SIGNPOST_READ, CeruleanPoliceSign - signpost 7, 23, SIGNPOST_READ, CeruleanCapeSign - signpost 29, 14, SIGNPOST_READ, CeruleanLockedDoor - signpost 21, 20, SIGNPOST_READ, CeruleanCityPokecenterSign - signpost 29, 26, SIGNPOST_READ, CeruleanCityMartSign - signpost 12, 2, SIGNPOST_ITEM, CeruleanCityHiddenBerserkGene + bg_event 23, 23, BGEVENT_READ, CeruleanCitySign + bg_event 25, 27, BGEVENT_READ, CeruleanGymSign + bg_event 29, 11, BGEVENT_READ, CeruleanBikeShopSign + bg_event 17, 25, BGEVENT_READ, CeruleanPoliceSign + bg_event 7, 23, BGEVENT_READ, CeruleanCapeSign + bg_event 29, 14, BGEVENT_READ, CeruleanLockedDoor + bg_event 21, 20, BGEVENT_READ, CeruleanCityPokecenterSign + bg_event 29, 26, BGEVENT_READ, CeruleanCityMartSign + bg_event 12, 2, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_COOLTRAINER_M, 23, 15, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1 - person_event SPRITE_SUPER_NERD, 15, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanCitySuperNerdScript, -1 - person_event SPRITE_SLOWPOKE, 24, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1 - person_event SPRITE_COOLTRAINER_F, 24, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanCityCooltrainerFScript, -1 - person_event SPRITE_FISHER, 26, 30, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeruleanCityFisherScript, -1 - person_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1 + object_event SPRITE_COOLTRAINER_M, 23, 15, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1 + object_event SPRITE_SUPER_NERD, 15, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCitySuperNerdScript, -1 + object_event SPRITE_SLOWPOKE, 24, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1 + object_event SPRITE_COOLTRAINER_F, 24, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerFScript, -1 + object_event SPRITE_FISHER, 26, 30, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityFisherScript, -1 + object_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index e7f9e9a1f..b014199b7 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -7,15 +7,15 @@ const_value set 2 const CERULEANGYM_GYM_GUY CeruleanGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .GruntRunsOut + scene_script .DummyScene0 + scene_script .GruntRunsOut .MapCallbacks: db 0 -.DummyTrigger0: +.DummyScene0: end .GruntRunsOut: @@ -48,9 +48,9 @@ CeruleanGym_MapScriptHeader: 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 + setscene $0 + setmapscene ROUTE_25, $1 + setmapscene POWER_PLANT, $0 waitsfx special RestartMapMusic pause 15 @@ -372,20 +372,20 @@ CeruleanGym_MapEventHeader: warp_def $f, $4, 5, CERULEAN_CITY warp_def $f, $5, 5, CERULEAN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 8, 3, SIGNPOST_ITEM, CeruleanGymHiddenMachinePart - signpost 13, 2, SIGNPOST_READ, CeruleanGymStatue1 - signpost 13, 6, SIGNPOST_READ, CeruleanGymStatue2 + bg_event 8, 3, BGEVENT_ITEM, CeruleanGymHiddenMachinePart + bg_event 13, 2, BGEVENT_READ, CeruleanGymStatue1 + bg_event 13, 6, BGEVENT_READ, CeruleanGymStatue2 -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_ROCKET, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET - person_event SPRITE_MISTY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_SWIMMER_GIRL, 6, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_SWIMMER_GIRL, 9, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_SWIMMER_GUY, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event SPRITE_ROCKET, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET + object_event SPRITE_MISTY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event SPRITE_SWIMMER_GIRL, 6, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event SPRITE_SWIMMER_GIRL, 9, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event SPRITE_SWIMMER_GUY, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index 2eae4d404..92c40682f 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M CeruleanGymBadgeSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -25,12 +25,12 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader: warp_def $7, $2, 1, CERULEAN_CITY warp_def $7, $3, 1, CERULEAN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1 + object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1 diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index 4692f0081..b2674dd46 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -4,7 +4,7 @@ const_value set 2 const CERULEANMART_COOLTRAINER_F CeruleanMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -54,14 +54,14 @@ CeruleanMart_MapEventHeader: warp_def $7, $2, 6, CERULEAN_CITY warp_def $7, $3, 6, CERULEAN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1 - person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1 - person_event SPRITE_COOLTRAINER_F, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1 + object_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1 + object_event SPRITE_COOLTRAINER_F, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1 diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 75990c9c8..83e64fca5 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const CERULEANPOKECENTER1F_GYM_GUY CeruleanPokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -72,14 +72,14 @@ CeruleanPokecenter1F_MapEventHeader: warp_def $7, $4, 4, CERULEAN_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x18820f, -1 - person_event SPRITE_SUPER_NERD, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1 - person_event SPRITE_GYM_GUY, 5, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18820f, -1 + object_event SPRITE_SUPER_NERD, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1 + object_event SPRITE_GYM_GUY, 5, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1 diff --git a/maps/CeruleanPokecenter2FBeta.asm b/maps/CeruleanPokecenter2FBeta.asm index 96c924b71..ba25a36b3 100644 --- a/maps/CeruleanPokecenter2FBeta.asm +++ b/maps/CeruleanPokecenter2FBeta.asm @@ -1,5 +1,5 @@ CeruleanPokecenter2FBeta_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -13,11 +13,11 @@ CeruleanPokecenter2FBeta_MapEventHeader: db 1 warp_def $7, $0, 1, CERULEAN_POKECENTER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 219efdca5..8e3271e4e 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -4,7 +4,7 @@ const_value set 2 const CERULEANPOLICESTATION_DIGLETT CeruleanPoliceStation_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -52,14 +52,14 @@ CeruleanPoliceStation_MapEventHeader: warp_def $7, $2, 2, CERULEAN_CITY warp_def $7, $3, 2, CERULEAN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_FISHING_GURU, 1, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1 - person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1 - person_event SPRITE_DIGLETT, 5, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CeruleanDiglett, -1 + object_event SPRITE_FISHING_GURU, 1, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1 + object_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1 + object_event SPRITE_DIGLETT, 5, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 617f443e5..16c043862 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -5,7 +5,7 @@ const_value set 2 const CERULEANTRADESPEECHHOUSE_ZUBAT CeruleanTradeSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -62,15 +62,15 @@ CeruleanTradeSpeechHouse_MapEventHeader: warp_def $7, $2, 3, CERULEAN_CITY warp_def $7, $3, 3, CERULEAN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_GRANNY, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1 - person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1 - person_event SPRITE_RHYDON, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, RhydonScript_0x188139, -1 - person_event SPRITE_ZUBAT, 6, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ZubatScript_0x188143, -1 + object_event SPRITE_GRANNY, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1 + object_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1 + object_event SPRITE_RHYDON, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x188139, -1 + object_event SPRITE_ZUBAT, 6, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ZubatScript_0x188143, -1 diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 67ebe06d0..cfad6ab1d 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -4,7 +4,7 @@ const_value set 2 const CHARCOALKILN_MOLTRES CharcoalKiln_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -157,17 +157,17 @@ CharcoalKiln_MapEventHeader: warp_def $7, $2, 2, AZALEA_TOWN warp_def $7, $3, 2, AZALEA_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 1, 0, SIGNPOST_READ, CharcoalKilnBookshelf - signpost 1, 1, SIGNPOST_READ, CharcoalKilnBookshelf - signpost 1, 7, SIGNPOST_READ, CharcoalKilnRadio + bg_event 1, 0, BGEVENT_READ, CharcoalKilnBookshelf + bg_event 1, 1, BGEVENT_READ, CharcoalKilnBookshelf + bg_event 1, 7, BGEVENT_READ, CharcoalKilnRadio -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS - person_event SPRITE_YOUNGSTER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE - person_event SPRITE_MOLTRES, 6, 5, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D + object_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS + object_event SPRITE_YOUNGSTER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE + object_event SPRITE_MOLTRES, 6, 5, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 043dfcb54..0b6f01283 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -6,19 +6,19 @@ const_value set 2 const CHERRYGROVECITY_FISHER CherrygroveCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 dbw MAPCALLBACK_NEWMAP, .FlyPoint -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end .FlyPoint: @@ -100,9 +100,9 @@ CherrygroveCityGuideGent: closetext end -CherrygroveSilverTriggerSouth: - moveperson CHERRYGROVECITY_SILVER, $27, $7 -CherrygroveSilverTriggerNorth: +CherrygroveSilverSceneSouth: + moveobject CHERRYGROVECITY_SILVER, $27, $7 +CherrygroveSilverSceneNorth: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic @@ -171,7 +171,7 @@ CherrygroveSilverTriggerNorth: spriteface PLAYER, LEFT applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft disappear CHERRYGROVECITY_SILVER - dotrigger $0 + setscene $0 special HealParty playmapmusic end @@ -558,22 +558,22 @@ CherrygroveCity_MapEventHeader: warp_def $9, $19, 1, GUIDE_GENTS_HOUSE warp_def $b, $1f, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 1, $6, $21, CherrygroveSilverTriggerNorth - xy_trigger 1, $7, $21, CherrygroveSilverTriggerSouth + coord_event 1, $6, $21, CherrygroveSilverSceneNorth + coord_event 1, $7, $21, CherrygroveSilverSceneSouth -.Signposts: +.BGEvents: db 4 - signpost 8, 30, SIGNPOST_READ, CherrygroveCitySign - signpost 9, 23, SIGNPOST_READ, GuideGentsHouseSign - signpost 3, 24, SIGNPOST_READ, CherrygroveCityMartSign - signpost 3, 30, SIGNPOST_READ, CherrygroveCityPokecenterSign + bg_event 8, 30, BGEVENT_READ, CherrygroveCitySign + bg_event 9, 23, BGEVENT_READ, GuideGentsHouseSign + bg_event 3, 24, BGEVENT_READ, CherrygroveCityMartSign + bg_event 3, 30, BGEVENT_READ, CherrygroveCityPokecenterSign -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_GRAMPS, 6, 32, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE - person_event SPRITE_SILVER, 6, 39, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY - person_event SPRITE_TEACHER, 12, 27, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1 - person_event SPRITE_YOUNGSTER, 7, 23, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1 - person_event SPRITE_FISHER, 12, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, MysticWaterGuy, -1 + object_event SPRITE_GRAMPS, 6, 32, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE + object_event SPRITE_SILVER, 6, 39, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY + object_event SPRITE_TEACHER, 12, 27, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1 + object_event SPRITE_YOUNGSTER, 7, 23, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1 + object_event SPRITE_FISHER, 12, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MysticWaterGuy, -1 diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index ffe465800..411e77d09 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER CherrygroveEvolutionSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -50,15 +50,15 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader: warp_def $7, $2, 5, CHERRYGROVE_CITY warp_def $7, $3, 5, CHERRYGROVE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, CherrygroveEvolutionSpeechHouseBookshelf - signpost 1, 1, SIGNPOST_READ, CherrygroveEvolutionSpeechHouseBookshelf + bg_event 1, 0, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_LASS, 5, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x196cb9, -1 - person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1 + object_event SPRITE_LASS, 5, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LassScript_0x196cb9, -1 + object_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index 9b918fc92..409624fe1 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER CherrygroveGymSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -53,15 +53,15 @@ CherrygroveGymSpeechHouse_MapEventHeader: warp_def $7, $2, 3, CHERRYGROVE_CITY warp_def $7, $3, 3, CHERRYGROVE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, CherrygroveGymSpeechHouseBookshelf - signpost 1, 1, SIGNPOST_READ, CherrygroveGymSpeechHouseBookshelf + bg_event 1, 0, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1 - person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1 + object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1 + object_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 34e5da5f1..e835dbee2 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -4,7 +4,7 @@ const_value set 2 const CHERRYGROVEMART_YOUNGSTER CherrygroveMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -80,14 +80,14 @@ CherrygroveMart_MapEventHeader: warp_def $7, $2, 1, CHERRYGROVE_CITY warp_def $7, $3, 1, CHERRYGROVE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1 - person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1 - person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1 + object_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1 + object_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1 diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm index 0a03ba707..f9b111012 100644 --- a/maps/CherrygrovePokecenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const CHERRYGROVEPOKECENTER1F_TEACHER CherrygrovePokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -78,15 +78,15 @@ CherrygrovePokecenter1F_MapEventHeader: warp_def $7, $4, 2, CHERRYGROVE_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x19696d, -1 - person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1 - person_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1 - person_event SPRITE_TEACHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x196976, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19696d, -1 + object_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1 + object_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1 + object_event SPRITE_TEACHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x196976, -1 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 80aac3499..23ea94742 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -13,19 +13,19 @@ const_value set 2 const CIANWOODCITY_SUICUNE CianwoodCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 dbw MAPCALLBACK_NEWMAP, .FlyPointAndSuicune -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end .FlyPointAndSuicune: @@ -49,9 +49,9 @@ CianwoodCitySuicuneAndEusine: applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0 disappear CIANWOODCITY_SUICUNE pause 10 - dotrigger $0 + setscene $0 clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42 - domaptrigger ROUTE_42, $1 + setmapscene ROUTE_42, $1 checkevent EVENT_FOUGHT_EUSINE iftrue .Done setevent EVENT_FOUGHT_EUSINE @@ -394,32 +394,32 @@ CianwoodCity_MapEventHeader: warp_def $25, $f, 1, CIANWOOD_LUGIA_SPEECH_HOUSE warp_def $11, $5, 1, POKE_SEERS_HOUSE -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 1, $10, $b, CianwoodCitySuicuneAndEusine + coord_event 1, $10, $b, CianwoodCitySuicuneAndEusine -.Signposts: +.BGEvents: db 8 - signpost 34, 20, SIGNPOST_READ, CianwoodCitySign - signpost 45, 7, SIGNPOST_READ, CianwoodGymSign - signpost 43, 24, SIGNPOST_READ, CianwoodPokecenterSign - signpost 47, 19, SIGNPOST_READ, CianwoodPharmacySign - signpost 32, 8, SIGNPOST_READ, CianwoodPhotoStudioSign - signpost 24, 8, SIGNPOST_READ, CianwoodPokeSeerSign - signpost 19, 4, SIGNPOST_ITEM, CianwoodCityHiddenRevive - signpost 29, 5, SIGNPOST_ITEM, CianwoodCityHiddenMaxEther + bg_event 34, 20, BGEVENT_READ, CianwoodCitySign + bg_event 45, 7, BGEVENT_READ, CianwoodGymSign + bg_event 43, 24, BGEVENT_READ, CianwoodPokecenterSign + bg_event 47, 19, BGEVENT_READ, CianwoodPharmacySign + bg_event 32, 8, BGEVENT_READ, CianwoodPhotoStudioSign + bg_event 24, 8, BGEVENT_READ, CianwoodPokeSeerSign + bg_event 19, 4, BGEVENT_ITEM, CianwoodCityHiddenRevive + bg_event 29, 5, BGEVENT_ITEM, CianwoodCityHiddenMaxEther -.PersonEvents: +.ObjectEvents: db 12 - person_event SPRITE_STANDING_YOUNGSTER, 37, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CianwoodCityYoungster, -1 - person_event SPRITE_POKEFAN_M, 33, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityPokefanM, -1 - person_event SPRITE_LASS, 42, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityLass, -1 - person_event SPRITE_ROCK, 16, 8, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 17, 9, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 25, 4, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 29, 5, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 27, 10, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 19, 4, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 - person_event SPRITE_POKEFAN_F, 46, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityChucksWife, -1 - person_event SPRITE_SUPER_NERD, 21, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE - person_event SPRITE_SUICUNE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY + object_event SPRITE_STANDING_YOUNGSTER, 37, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodCityYoungster, -1 + object_event SPRITE_POKEFAN_M, 33, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityPokefanM, -1 + object_event SPRITE_LASS, 42, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityLass, -1 + object_event SPRITE_ROCK, 16, 8, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event SPRITE_ROCK, 17, 9, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event SPRITE_ROCK, 25, 4, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event SPRITE_ROCK, 29, 5, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event SPRITE_ROCK, 27, 10, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event SPRITE_ROCK, 19, 4, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event SPRITE_POKEFAN_F, 46, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityChucksWife, -1 + object_event SPRITE_SUPER_NERD, 21, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE + object_event SPRITE_SUICUNE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm index 6cfa2d522..0a901ff28 100644 --- a/maps/CianwoodCityPhotoStudio.asm +++ b/maps/CianwoodCityPhotoStudio.asm @@ -2,7 +2,7 @@ const_value set 2 const CIANWOODCITYPHOTOSTUDIO_FISHING_GURU CianwoodCityPhotoStudio_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -57,12 +57,12 @@ CianwoodCityPhotoStudio_MapEventHeader: warp_def $7, $2, 5, CIANWOOD_CITY warp_def $7, $3, 5, CIANWOOD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1 + object_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1 diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 276e9fb21..34c6df728 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -10,7 +10,7 @@ const_value set 2 const CIANWOODGYM_BOULDER4 CianwoodGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -50,7 +50,7 @@ ChuckScript_0x9d60f: waitsfx setflag ENGINE_STORMBADGE checkcode VAR_BADGES - scall CianwoodGymTriggerRockets + scall CianwoodGymActivateRockets .FightDone: checkevent EVENT_GOT_TM01_DYNAMICPUNCH iftrue .AlreadyGotTM @@ -75,7 +75,7 @@ ChuckScript_0x9d60f: closetext end -CianwoodGymTriggerRockets: +CianwoodGymActivateRockets: if_equal 7, .RadioTowerRockets if_equal 6, .GoldenrodRockets end @@ -314,22 +314,22 @@ CianwoodGym_MapEventHeader: warp_def $11, $4, 2, CIANWOOD_CITY warp_def $11, $5, 2, CIANWOOD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 15, 3, SIGNPOST_READ, CianwoodGymStatue - signpost 15, 6, SIGNPOST_READ, CianwoodGymStatue + bg_event 15, 3, BGEVENT_READ, CianwoodGymStatue + bg_event 15, 6, BGEVENT_READ, CianwoodGymStatue -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_CHUCK, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1 - person_event SPRITE_BLACK_BELT, 12, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1 - person_event SPRITE_BLACK_BELT, 12, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBlackbeltLao, -1 - person_event SPRITE_BLACK_BELT, 9, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerBlackbeltNob, -1 - person_event SPRITE_BLACK_BELT, 5, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 1, TrainerBlackbeltLung, -1 - person_event SPRITE_BOULDER, 1, 5, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 - person_event SPRITE_BOULDER, 7, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 - person_event SPRITE_BOULDER, 7, 4, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 - person_event SPRITE_BOULDER, 7, 5, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 + object_event SPRITE_CHUCK, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1 + object_event SPRITE_BLACK_BELT, 12, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1 + object_event SPRITE_BLACK_BELT, 12, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1 + object_event SPRITE_BLACK_BELT, 9, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltNob, -1 + object_event SPRITE_BLACK_BELT, 5, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBlackbeltLung, -1 + object_event SPRITE_BOULDER, 1, 5, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 + object_event SPRITE_BOULDER, 7, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 + object_event SPRITE_BOULDER, 7, 4, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 + object_event SPRITE_BOULDER, 7, 5, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 5e136bf71..2457ef435 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -4,7 +4,7 @@ const_value set 2 const CIANWOODLUGIASPEECHHOUSE_TWIN CianwoodLugiaSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -70,16 +70,16 @@ CianwoodLugiaSpeechHouse_MapEventHeader: warp_def $7, $2, 6, CIANWOOD_CITY warp_def $7, $3, 6, CIANWOOD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, CianwoodLugiaSpeechHouseBookshelf - signpost 1, 1, SIGNPOST_READ, CianwoodLugiaSpeechHouseBookshelf + bg_event 1, 0, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1 - person_event SPRITE_LASS, 5, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1 - person_event SPRITE_TWIN, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1 + object_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1 + object_event SPRITE_LASS, 5, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1 + object_event SPRITE_TWIN, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1 diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 68de864bb..4a6cf826e 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -2,14 +2,14 @@ const_value set 2 const CIANWOODPHARMACY_PHARMACIST CianwoodPharmacy_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - maptrigger .DummyTrigger + scene_script .DummyScene .MapCallbacks: db 0 -.DummyTrigger: +.DummyScene: end CianwoodPharmacist: @@ -81,14 +81,14 @@ CianwoodPharmacy_MapEventHeader: warp_def $7, $2, 4, CIANWOOD_CITY warp_def $7, $3, 4, CIANWOOD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, CianwoodPharmacyBookshelf - signpost 1, 1, SIGNPOST_READ, CianwoodPharmacyBookshelf + bg_event 1, 0, BGEVENT_READ, CianwoodPharmacyBookshelf + bg_event 1, 1, BGEVENT_READ, CianwoodPharmacyBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_PHARMACIST, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CianwoodPharmacist, -1 + object_event SPRITE_PHARMACIST, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPharmacist, -1 diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index bcc8e1256..ab39de7ca 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const CIANWOODPOKECENTER1F_SUPER_NERD CianwoodPokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -141,15 +141,15 @@ CianwoodPokecenter1F_MapEventHeader: warp_def $7, $4, 3, CIANWOOD_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1 - person_event SPRITE_LASS, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1 - person_event SPRITE_GYM_GUY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1 - person_event SPRITE_SUPER_NERD, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1 + object_event SPRITE_LASS, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1 + object_event SPRITE_GYM_GUY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1 + object_event SPRITE_SUPER_NERD, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index c4a742826..f5723a4fd 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -2,7 +2,7 @@ const_value set 2 const CINNABARISLAND_BLUE CinnabarIsland_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -135,16 +135,16 @@ CinnabarIsland_MapEventHeader: db 1 warp_def $b, $b, 1, CINNABAR_POKECENTER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 11, 12, SIGNPOST_READ, CinnabarIslandPokecenterSign - signpost 11, 9, SIGNPOST_READ, CinnabarIslandGymSign - signpost 7, 7, SIGNPOST_READ, CinnabarIslandSign - signpost 1, 9, SIGNPOST_ITEM, CinnabarIslandHiddenRareCandy + bg_event 11, 12, BGEVENT_READ, CinnabarIslandPokecenterSign + bg_event 11, 9, BGEVENT_READ, CinnabarIslandGymSign + bg_event 7, 7, BGEVENT_READ, CinnabarIslandSign + bg_event 1, 9, BGEVENT_ITEM, CinnabarIslandHiddenRareCandy -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_BLUE, 6, 9, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR + object_event SPRITE_BLUE, 6, 9, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm index 151b76b3e..a079b8df0 100644 --- a/maps/CinnabarPokecenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const CINNABARPOKECENTER1F_FISHER CinnabarPokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -44,14 +44,14 @@ CinnabarPokecenter1F_MapEventHeader: warp_def $7, $4, 1, CINNABAR_ISLAND warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1 - person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1 - person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1 + object_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1 + object_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1 diff --git a/maps/CinnabarPokecenter2FBeta.asm b/maps/CinnabarPokecenter2FBeta.asm index 1a0c4c695..3ef9d77c7 100644 --- a/maps/CinnabarPokecenter2FBeta.asm +++ b/maps/CinnabarPokecenter2FBeta.asm @@ -1,5 +1,5 @@ CinnabarPokecenter2FBeta_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -13,11 +13,11 @@ CinnabarPokecenter2FBeta_MapEventHeader: db 1 warp_def $7, $0, 3, CINNABAR_POKECENTER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index abc3a63e7..b17f10d30 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -3,11 +3,11 @@ const_value set 2 const COLOSSEUM_CHRIS2 Colosseum_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 3 - maptrigger .InitializeColosseum - maptrigger .DummyTrigger1 - maptrigger .DummyTrigger2 + scene_script .InitializeColosseum + scene_script .DummyScene1 + scene_script .DummyScene2 .MapCallbacks: db 2 @@ -18,10 +18,10 @@ Colosseum_MapScriptHeader: priorityjump .InitializeAndPreparePokecenter2F end -.DummyTrigger1: +.DummyScene1: end -.DummyTrigger2: +.DummyScene2: end .SetWhichChris: @@ -37,12 +37,12 @@ Colosseum_MapScriptHeader: return .PreparePokecenter2F: - domaptrigger POKECENTER_2F, $2 + setmapscene POKECENTER_2F, $2 return .InitializeAndPreparePokecenter2F: - dotrigger $1 - domaptrigger POKECENTER_2F, $2 + setscene $1 + setmapscene POKECENTER_2F, $2 end MapColosseumSignpost1Script: @@ -71,15 +71,15 @@ Colosseum_MapEventHeader: warp_def $7, $4, 3, POKECENTER_2F warp_def $7, $5, 3, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 4, 4, SIGNPOST_RIGHT, MapColosseumSignpost1Script - signpost 4, 5, SIGNPOST_LEFT, MapColosseumSignpost1Script + bg_event 4, 4, BGEVENT_RIGHT, MapColosseumSignpost1Script + bg_event 4, 5, BGEVENT_LEFT, MapColosseumSignpost1Script -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT + object_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS + object_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 8449b41bb..e1df41b43 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -4,7 +4,7 @@ const_value set 2 const COPYCATSHOUSE1F_CLEFAIRY CopycatsHouse1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -82,14 +82,14 @@ CopycatsHouse1F_MapEventHeader: warp_def $7, $3, 8, SAFFRON_CITY warp_def $0, $2, 1, COPYCATS_HOUSE_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1 - person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1 - person_event SPRITE_CLEFAIRY, 6, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1 + object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1 + object_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1 + object_event SPRITE_CLEFAIRY, 6, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 854b7011c..73fe945e5 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -7,7 +7,7 @@ const_value set 2 const COPYCATSHOUSE2F_COPYCAT2 ; if player is female CopycatsHouse2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -368,19 +368,19 @@ CopycatsHouse2F_MapEventHeader: db 1 warp_def $0, $3, 3, COPYCATS_HOUSE_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, CopycatsHouse2FBookshelf - signpost 1, 1, SIGNPOST_READ, CopycatsHouse2FBookshelf + bg_event 1, 0, BGEVENT_READ, CopycatsHouse2FBookshelf + bg_event 1, 1, BGEVENT_READ, CopycatsHouse2FBookshelf -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1 - person_event SPRITE_MOLTRES, 4, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CopycatsDodrio, -1 - person_event SPRITE_FAIRY, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL - person_event SPRITE_MONSTER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 - person_event SPRITE_BIRD, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 - person_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_2 + object_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1 + object_event SPRITE_MOLTRES, 4, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CopycatsDodrio, -1 + object_event SPRITE_FAIRY, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL + object_event SPRITE_MONSTER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 + object_event SPRITE_BIRD, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 + object_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_2 diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 96324b446..58184be24 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -10,7 +10,7 @@ const_value set 2 const DANCETHEATRE_GRANNY DanceTheatre_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -346,22 +346,22 @@ DanceTheatre_MapEventHeader: warp_def $d, $5, 8, ECRUTEAK_CITY warp_def $d, $6, 8, ECRUTEAK_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 6, 5, SIGNPOST_UP, MapDanceTheatreSignpost1Script - signpost 6, 6, SIGNPOST_UP, MapDanceTheatreSignpost1Script + bg_event 6, 5, BGEVENT_UP, MapDanceTheatreSignpost1Script + bg_event 6, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_KIMONO_GIRL, 2, 0, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 0, TrainerKimono_girlNaoko2, -1 - person_event SPRITE_KIMONO_GIRL, 1, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 0, TrainerKimono_girlSayo, -1 - person_event SPRITE_KIMONO_GIRL, 2, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 0, TrainerKimono_girlZuki, -1 - person_event SPRITE_KIMONO_GIRL, 1, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 0, TrainerKimono_girlKuni, -1 - person_event SPRITE_KIMONO_GIRL, 2, 11, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 0, TrainerKimono_girlMiki, -1 - person_event SPRITE_GENTLEMAN, 10, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x994c6, -1 - person_event SPRITE_RHYDON, 8, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, RhydonScript_0x9951b, -1 - person_event SPRITE_COOLTRAINER_M, 10, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, DanceTheatreCooltrainerMScript, -1 - person_event SPRITE_GRANNY, 6, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DanceTheatreGrannyScript, -1 + object_event SPRITE_KIMONO_GIRL, 2, 0, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimono_girlNaoko2, -1 + object_event SPRITE_KIMONO_GIRL, 1, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimono_girlSayo, -1 + object_event SPRITE_KIMONO_GIRL, 2, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimono_girlZuki, -1 + object_event SPRITE_KIMONO_GIRL, 1, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimono_girlKuni, -1 + object_event SPRITE_KIMONO_GIRL, 2, 11, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimono_girlMiki, -1 + object_event SPRITE_GENTLEMAN, 10, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x994c6, -1 + object_event SPRITE_RHYDON, 8, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x9951b, -1 + object_event SPRITE_COOLTRAINER_M, 10, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DanceTheatreCooltrainerMScript, -1 + object_event SPRITE_GRANNY, 6, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheatreGrannyScript, -1 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 88b66a289..e003d2951 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -4,7 +4,7 @@ const_value set 2 const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2 DarkCaveBlackthornEntrance_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -70,14 +70,14 @@ DarkCaveBlackthornEntrance_MapEventHeader: warp_def $3, $17, 1, ROUTE_45 warp_def $19, $3, 2, DARK_CAVE_VIOLET_ENTRANCE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_PHARMACIST, 3, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1 - person_event SPRITE_POKE_BALL, 24, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE - person_event SPRITE_POKE_BALL, 22, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE + object_event SPRITE_PHARMACIST, 3, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1 + object_event SPRITE_POKE_BALL, 24, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE + object_event SPRITE_POKE_BALL, 22, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index b9c5c5380..03ab3b072 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -9,7 +9,7 @@ const_value set 2 const DARKCAVEVIOLETENTRANCE_POKE_BALL4 DarkCaveVioletEntrance_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -44,20 +44,20 @@ DarkCaveVioletEntrance_MapEventHeader: warp_def $1, $11, 2, DARK_CAVE_BLACKTHORN_ENTRANCE warp_def $21, $23, 3, ROUTE_46 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 3, 26, SIGNPOST_ITEM, DarkCaveVioletEntranceHiddenElixer + bg_event 3, 26, BGEVENT_ITEM, DarkCaveVioletEntranceHiddenElixer -.PersonEvents: +.ObjectEvents: db 8 - person_event SPRITE_POKE_BALL, 8, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION - person_event SPRITE_ROCK, 14, 16, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 - person_event SPRITE_ROCK, 6, 27, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 - person_event SPRITE_ROCK, 14, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 - person_event SPRITE_ROCK, 31, 36, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 - person_event SPRITE_POKE_BALL, 22, 36, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntranceFullHeal, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL - person_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntranceHyperPotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION - person_event SPRITE_POKE_BALL, 28, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntranceDireHit, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT + object_event SPRITE_POKE_BALL, 8, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION + object_event SPRITE_ROCK, 14, 16, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 + object_event SPRITE_ROCK, 6, 27, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 + object_event SPRITE_ROCK, 14, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 + object_event SPRITE_ROCK, 31, 36, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 + object_event SPRITE_POKE_BALL, 22, 36, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceFullHeal, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL + object_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceHyperPotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION + object_event SPRITE_POKE_BALL, 28, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceDireHit, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 75a409b65..fc7865f98 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -3,7 +3,7 @@ const_value set 2 const DAYCARE_GRANNY DayCare_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -166,15 +166,15 @@ DayCare_MapEventHeader: warp_def $7, $2, 5, ROUTE_34 warp_def $7, $3, 5, ROUTE_34 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, DayCareBookshelf - signpost 1, 1, SIGNPOST_READ, DayCareBookshelf + bg_event 1, 0, BGEVENT_READ, DayCareBookshelf + bg_event 1, 1, BGEVENT_READ, DayCareBookshelf -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE - person_event SPRITE_GRANNY, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, DayCareLadyScript, -1 + object_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE + object_event SPRITE_GRANNY, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DayCareLadyScript, -1 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 230610df5..53c3f73dd 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -2,7 +2,7 @@ const_value set 2 const DIGLETTSCAVE_POKEFAN_M DiglettsCave_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -36,13 +36,13 @@ DiglettsCave_MapEventHeader: warp_def $21, $11, 2, DIGLETTS_CAVE warp_def $3, $3, 4, DIGLETTS_CAVE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 11, 6, SIGNPOST_ITEM, DiglettsCaveHiddenMaxRevive + bg_event 11, 6, BGEVENT_ITEM, DiglettsCaveHiddenMaxRevive -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKEFAN_M, 31, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1 + object_event SPRITE_POKEFAN_M, 31, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 33e86f258..0e805f230 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -5,10 +5,10 @@ const_value set 2 const DRAGONSHRINE_CLAIR DragonShrine_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DragonShrineTest - maptrigger .DummyTrigger + scene_script .DragonShrineTest + scene_script .DummyScene .MapCallbacks: db 0 @@ -17,7 +17,7 @@ DragonShrine_MapScriptHeader: priorityjump .DragonShrineTestScript end -.DummyTrigger: +.DummyScene: end .DragonShrineTestScript: @@ -165,8 +165,8 @@ DragonShrine_MapScriptHeader: waitsfx special RestartMapMusic specialphonecall SPECIALCALL_MASTERBALL - dotrigger $1 - domaptrigger DRAGONS_DEN_B1F, $1 + setscene $1 + setmapscene DRAGONS_DEN_B1F, $1 writetext UnknownText_0x18d9f2 buttonsound writetext UnknownText_0x18da0b @@ -677,15 +677,15 @@ DragonShrine_MapEventHeader: warp_def $9, $4, 2, DRAGONS_DEN_B1F warp_def $9, $5, 2, DRAGONS_DEN_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_ELDER, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_ELDER, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_ELDER, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_CLAIR, 8, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR + object_event SPRITE_ELDER, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS + object_event SPRITE_ELDER, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS + object_event SPRITE_ELDER, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS + object_event SPRITE_CLAIR, 8, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm index aaadae4d4..46f6a30a5 100644 --- a/maps/DragonsDen1F.asm +++ b/maps/DragonsDen1F.asm @@ -1,5 +1,5 @@ DragonsDen1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -16,11 +16,11 @@ DragonsDen1F_MapEventHeader: warp_def $f, $5, 1, DRAGONS_DEN_B1F warp_def $d, $5, 2, DRAGONS_DEN_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index c41fb07ed..c638132f5 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -10,19 +10,19 @@ const_value set 2 const DRAGONSDENB1F_POKE_BALL3 DragonsDenB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 dbw MAPCALLBACK_NEWMAP, .CheckSilver -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end .CheckSilver: @@ -42,7 +42,7 @@ DragonsDenB1F_MapScriptHeader: appear DRAGONSDENB1F_SILVER return -DragonsDenB1F_ClairTrigger: +DragonsDenB1F_ClairScene: appear DRAGONSDENB1F_CLAIR opentext writetext ClairText_Wait @@ -80,7 +80,7 @@ DragonsDenB1F_ClairTrigger: pause 30 special RestartMapMusic disappear DRAGONSDENB1F_CLAIR - dotrigger $0 + setscene $0 end TrainerCooltrainermDarin: @@ -415,25 +415,25 @@ DragonsDenB1F_MapEventHeader: warp_def $3, $14, 3, DRAGONS_DEN_1F warp_def $1d, $13, 1, DRAGON_SHRINE -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 1, $1e, $13, DragonsDenB1F_ClairTrigger + coord_event 1, $1e, $13, DragonsDenB1F_ClairScene -.Signposts: +.BGEvents: db 4 - signpost 24, 18, SIGNPOST_READ, MapDragonsDenB1FSignpost0Script - signpost 29, 33, SIGNPOST_ITEM, DragonsDenB1FHiddenRevive - signpost 17, 21, SIGNPOST_ITEM, DragonsDenB1FHiddenMaxPotion - signpost 15, 31, SIGNPOST_ITEM, DragonsDenB1FHiddenMaxElixer + bg_event 24, 18, BGEVENT_READ, MapDragonsDenB1FSignpost0Script + bg_event 29, 33, BGEVENT_ITEM, DragonsDenB1FHiddenRevive + bg_event 17, 21, BGEVENT_ITEM, DragonsDenB1FHiddenMaxPotion + bg_event 15, 31, BGEVENT_ITEM, DragonsDenB1FHiddenMaxElixer -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_POKE_BALL, 16, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG - person_event SPRITE_CLAIR, 30, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR - person_event SPRITE_SILVER, 23, 20, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN - person_event SPRITE_COOLTRAINER_M, 8, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerCooltrainermDarin, -1 - person_event SPRITE_COOLTRAINER_F, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1 - person_event SPRITE_TWIN, 17, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1 - person_event SPRITE_TWIN, 18, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsLeaandpia2, -1 - person_event SPRITE_POKE_BALL, 4, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DragonsDenB1FCalcium, EVENT_DRAGONS_DEN_B1F_CALCIUM - person_event SPRITE_POKE_BALL, 20, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DragonsDenB1FMaxElixer, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER + object_event SPRITE_POKE_BALL, 16, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG + object_event SPRITE_CLAIR, 30, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR + object_event SPRITE_SILVER, 23, 20, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN + object_event SPRITE_COOLTRAINER_M, 8, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermDarin, -1 + object_event SPRITE_COOLTRAINER_F, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1 + object_event SPRITE_TWIN, 17, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1 + object_event SPRITE_TWIN, 18, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia2, -1 + object_event SPRITE_POKE_BALL, 4, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FCalcium, EVENT_DRAGONS_DEN_B1F_CALCIUM + object_event SPRITE_POKE_BALL, 20, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FMaxElixer, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index f4df23dc1..7da92ec0f 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -7,7 +7,7 @@ const_value set 2 const EARLSPOKEMONACADEMY_POKEDEX EarlsPokemonAcademy_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -421,21 +421,21 @@ EarlsPokemonAcademy_MapEventHeader: warp_def $f, $3, 3, VIOLET_CITY warp_def $f, $4, 3, VIOLET_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 1, 0, SIGNPOST_READ, AcademyBookshelf - signpost 1, 1, SIGNPOST_READ, AcademyBookshelf - signpost 0, 3, SIGNPOST_READ, AcademyBlackboard - signpost 0, 4, SIGNPOST_READ, AcademyBlackboard + bg_event 1, 0, BGEVENT_READ, AcademyBookshelf + bg_event 1, 1, BGEVENT_READ, AcademyBookshelf + bg_event 0, 3, BGEVENT_READ, AcademyBlackboard + bg_event 0, 4, BGEVENT_READ, AcademyBlackboard -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_FISHER, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL - person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1 - person_event SPRITE_GAMEBOY_KID, 11, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1 - person_event SPRITE_GAMEBOY_KID, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid2Script, -1 - person_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster2Script, -1 - person_event SPRITE_POKEDEX, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AcademyNotebook, -1 + object_event SPRITE_FISHER, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL + object_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1 + object_event SPRITE_GAMEBOY_KID, 11, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1 + object_event SPRITE_GAMEBOY_KID, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid2Script, -1 + object_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster2Script, -1 + object_event SPRITE_POKEDEX, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AcademyNotebook, -1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 8d742d07a..9e359419b 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -8,7 +8,7 @@ const_value set 2 const ECRUTEAKCITY_GRAMPS3 EcruteakCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -281,26 +281,26 @@ EcruteakCity_MapEventHeader: warp_def $12, $0, 3, ROUTE_38_ECRUTEAK_GATE warp_def $13, $0, 4, ROUTE_38_ECRUTEAK_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 8 - signpost 21, 15, SIGNPOST_READ, EcruteakCitySign - signpost 10, 38, SIGNPOST_READ, TinTowerSign - signpost 28, 8, SIGNPOST_READ, EcruteakGymSign - signpost 21, 21, SIGNPOST_READ, EcruteakDanceTheaterSign - signpost 10, 2, SIGNPOST_READ, BurnedTowerSign - signpost 27, 24, SIGNPOST_READ, EcruteakCityPokecenterSign - signpost 21, 30, SIGNPOST_READ, EcruteakCityMartSign - signpost 14, 23, SIGNPOST_ITEM, EcruteakCityHiddenHyperPotion + bg_event 21, 15, BGEVENT_READ, EcruteakCitySign + bg_event 10, 38, BGEVENT_READ, TinTowerSign + bg_event 28, 8, BGEVENT_READ, EcruteakGymSign + bg_event 21, 21, BGEVENT_READ, EcruteakDanceTheaterSign + bg_event 10, 2, BGEVENT_READ, BurnedTowerSign + bg_event 27, 24, BGEVENT_READ, EcruteakCityPokecenterSign + bg_event 21, 30, BGEVENT_READ, EcruteakCityMartSign + bg_event 14, 23, BGEVENT_ITEM, EcruteakCityHiddenHyperPotion -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_GRAMPS, 15, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1 - person_event SPRITE_GRAMPS, 21, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1 - person_event SPRITE_LASS, 29, 21, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, EcruteakCityLassScript, -1 - person_event SPRITE_LASS, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x1a4015, -1 - person_event SPRITE_FISHER, 22, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1 - person_event SPRITE_YOUNGSTER, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, EcruteakCityYoungsterScript, -1 - person_event SPRITE_GRAMPS, 7, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS + object_event SPRITE_GRAMPS, 15, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1 + object_event SPRITE_GRAMPS, 21, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1 + object_event SPRITE_LASS, 29, 21, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLassScript, -1 + object_event SPRITE_LASS, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1a4015, -1 + object_event SPRITE_FISHER, 22, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1 + object_event SPRITE_YOUNGSTER, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakCityYoungsterScript, -1 + object_event SPRITE_GRAMPS, 7, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 1b61ecfb2..6f54bb4bd 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -8,10 +8,10 @@ const_value set 2 const ECRUTEAKGYM_GRAMPS EcruteakGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .ForcedToLeave - maptrigger .DummyTrigger + scene_script .ForcedToLeave + scene_script .DummyScene .MapCallbacks: db 0 @@ -20,7 +20,7 @@ EcruteakGym_MapScriptHeader: priorityjump EcruteakGymClosed end -.DummyTrigger: +.DummyScene: end MortyScript_0x99d58: @@ -42,8 +42,8 @@ MortyScript_0x99d58: waitsfx setflag ENGINE_FOGBADGE checkcode VAR_BADGES - scall EcruteakGymTriggerRockets - domaptrigger ECRUTEAK_HOUSE, $1 + scall EcruteakGymActivateRockets + setmapscene ECRUTEAK_HOUSE, $1 setevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_RANG_CLEAR_BELL_2 .FightDone: @@ -70,7 +70,7 @@ MortyScript_0x99d58: closetext end -EcruteakGymTriggerRockets: +EcruteakGymActivateRockets: if_equal 7, .RadioTowerRockets if_equal 6, .GoldenrodRockets end @@ -426,20 +426,20 @@ EcruteakGym_MapEventHeader: warp_def $c, $7, 3, ECRUTEAK_GYM warp_def $d, $7, 3, ECRUTEAK_GYM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 15, 3, SIGNPOST_READ, EcruteakGymStatue - signpost 15, 6, SIGNPOST_READ, EcruteakGymStatue + bg_event 15, 3, BGEVENT_READ, EcruteakGymStatue + bg_event 15, 6, BGEVENT_READ, EcruteakGymStatue -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_MORTY, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, MortyScript_0x99d58, -1 - person_event SPRITE_SAGE, 7, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerSageJeffrey, -1 - person_event SPRITE_SAGE, 13, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSagePing, -1 - person_event SPRITE_GRANNY, 5, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 1, TrainerMediumMartha, -1 - person_event SPRITE_GRANNY, 9, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 1, TrainerMediumGrace, -1 - person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, EcruteakGymGuyScript, -1 - person_event SPRITE_GRAMPS, 14, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS + object_event SPRITE_MORTY, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MortyScript_0x99d58, -1 + object_event SPRITE_SAGE, 7, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1 + object_event SPRITE_SAGE, 13, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1 + object_event SPRITE_GRANNY, 5, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumMartha, -1 + object_event SPRITE_GRANNY, 9, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumGrace, -1 + object_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakGymGuyScript, -1 + object_event SPRITE_GRAMPS, 14, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 2959ad3cc..5cf1efc2a 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -5,19 +5,19 @@ const_value set 2 const ECRUTEAKHOUSE_GRAMPS EcruteakHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 dbw MAPCALLBACK_OBJECTS, .InitializeSages -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end .InitializeSages: @@ -35,7 +35,7 @@ EcruteakHouse_MapScriptHeader: setevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE checkitem CLEAR_BELL iftrue .NoClearBell - dotrigger $0 + setscene $0 .NoClearBell: return @@ -43,27 +43,27 @@ EcruteakHouse_MapScriptHeader: clearevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE return -EcruteakHouse_XYTrigger1: +EcruteakHouse_CoordEvent1: checkevent EVENT_RANG_CLEAR_BELL_2 - iftrue EcruteakHouse_XYTrigger_DontMove + iftrue EcruteakHouse_CoordEvent_DontMove applymovement ECRUTEAKHOUSE_SAGE2, MovementData_0x980c7 - moveperson ECRUTEAKHOUSE_SAGE1, $4, $6 + moveobject ECRUTEAKHOUSE_SAGE1, $4, $6 appear ECRUTEAKHOUSE_SAGE1 pause 5 disappear ECRUTEAKHOUSE_SAGE2 end -EcruteakHouse_XYTrigger2: +EcruteakHouse_CoordEvent2: checkevent EVENT_RANG_CLEAR_BELL_1 - iftrue EcruteakHouse_XYTrigger_DontMove + iftrue EcruteakHouse_CoordEvent_DontMove applymovement ECRUTEAKHOUSE_SAGE1, MovementData_0x980cc - moveperson ECRUTEAKHOUSE_SAGE2, $5, $6 + moveobject ECRUTEAKHOUSE_SAGE2, $5, $6 appear ECRUTEAKHOUSE_SAGE2 pause 5 disappear ECRUTEAKHOUSE_SAGE1 end -EcruteakHouse_XYTrigger_DontMove: +EcruteakHouse_CoordEvent_DontMove: end SageScript_0x98062: @@ -100,7 +100,7 @@ SageScript_0x98062: writetext UnknownText_0x98250 waitbutton closetext - dotrigger $1 + setscene $1 setevent EVENT_RANG_CLEAR_BELL_2 clearevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_GAVE_KURT_APRICORNS @@ -289,17 +289,17 @@ EcruteakHouse_MapEventHeader: warp_def $f, $11, 3, ECRUTEAK_HOUSE warp_def $3, $11, 3, WISE_TRIOS_ROOM -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $7, $4, EcruteakHouse_XYTrigger1 - xy_trigger 0, $7, $5, EcruteakHouse_XYTrigger2 + coord_event 0, $7, $4, EcruteakHouse_CoordEvent1 + coord_event 0, $7, $5, EcruteakHouse_CoordEvent2 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_SAGE, 6, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1 - person_event SPRITE_SAGE, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2 - person_event SPRITE_SAGE, 9, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE - person_event SPRITE_GRAMPS, 11, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakHouseGrampsScript, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + object_event SPRITE_SAGE, 6, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1 + object_event SPRITE_SAGE, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2 + object_event SPRITE_SAGE, 9, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + object_event SPRITE_GRAMPS, 11, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHouseGrampsScript, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 3a9745647..0188ce31c 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const ECRUTEAKITEMFINDERHOUSE_POKEDEX EcruteakItemfinderHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -171,14 +171,14 @@ EcruteakItemfinderHouse_MapEventHeader: warp_def $7, $3, 11, ECRUTEAK_CITY warp_def $7, $4, 11, ECRUTEAK_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 1, 2, SIGNPOST_READ, ItemFinderHouseRadio + bg_event 1, 2, BGEVENT_READ, ItemFinderHouseRadio -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_COOLTRAINER_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x9a5fb, -1 - person_event SPRITE_POKEDEX, 3, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokedexScript_0x9a620, -1 + object_event SPRITE_COOLTRAINER_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x9a5fb, -1 + object_event SPRITE_POKEDEX, 3, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x9a620, -1 diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 6ec0173ee..57f06d99e 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER EcruteakLugiaSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -53,14 +53,14 @@ EcruteakLugiaSpeechHouse_MapEventHeader: warp_def $7, $3, 7, ECRUTEAK_CITY warp_def $7, $4, 7, ECRUTEAK_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 1, 2, SIGNPOST_READ, LugiaSpeechHouseRadio + bg_event 1, 2, BGEVENT_READ, LugiaSpeechHouseRadio -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseGrampsScript, -1 - person_event SPRITE_YOUNGSTER, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseYoungsterScript, -1 + object_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseGrampsScript, -1 + object_event SPRITE_YOUNGSTER, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseYoungsterScript, -1 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 1747c1d57..b41c4a2d3 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -4,7 +4,7 @@ const_value set 2 const ECRUTEAKMART_GRANNY EcruteakMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -54,14 +54,14 @@ EcruteakMart_MapEventHeader: warp_def $7, $2, 9, ECRUTEAK_CITY warp_def $7, $3, 9, ECRUTEAK_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1 - person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1 - person_event SPRITE_GRANNY, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1 + object_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1 + object_event SPRITE_GRANNY, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1 diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index 704b378bd..c680fece0 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -6,10 +6,10 @@ const_value set 2 const ECRUTEAKPOKECENTER1F_BILL EcruteakPokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .MeetBill - maptrigger .DummyTrigger + scene_script .MeetBill + scene_script .DummyScene .MapCallbacks: db 0 @@ -18,7 +18,7 @@ EcruteakPokecenter1F_MapScriptHeader: priorityjump .BillActivatesTimeCapsule end -.DummyTrigger: +.DummyScene: end .BillActivatesTimeCapsule: @@ -53,7 +53,7 @@ EcruteakPokecenter1F_MapScriptHeader: disappear ECRUTEAKPOKECENTER1F_BILL clearevent EVENT_MET_BILL setflag ENGINE_TIME_CAPSULE - dotrigger $1 + setscene $1 waitsfx end @@ -216,16 +216,16 @@ EcruteakPokecenter1F_MapEventHeader: warp_def $7, $4, 6, ECRUTEAK_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1 - person_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1 - person_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1 - person_event SPRITE_GYM_GUY, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, EcruteakPokecenter1FGymGuyScript, -1 - person_event SPRITE_BILL, 7, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1 + object_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1 + object_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1 + object_event SPRITE_GYM_GUY, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FGymGuyScript, -1 + object_event SPRITE_BILL, 7, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index dbd8d270a..c8dcb1b29 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const ELMSHOUSE_ELMS_SON ElmsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -92,16 +92,16 @@ ElmsHouse_MapEventHeader: warp_def $7, $2, 4, NEW_BARK_TOWN warp_def $7, $3, 4, NEW_BARK_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 1, 0, SIGNPOST_READ, ElmsHousePC - signpost 1, 6, SIGNPOST_READ, ElmsHouseBookshelf - signpost 1, 7, SIGNPOST_READ, ElmsHouseBookshelf + bg_event 1, 0, BGEVENT_READ, ElmsHousePC + bg_event 1, 6, BGEVENT_READ, ElmsHouseBookshelf + bg_event 1, 7, BGEVENT_READ, ElmsHouseBookshelf -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_TEACHER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ElmsWife, -1 - person_event SPRITE_BUG_CATCHER, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ElmsSon, -1 + object_event SPRITE_TEACHER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1 + object_event SPRITE_BUG_CATCHER, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 4eeba20da..631969785 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -7,14 +7,14 @@ const_value set 2 const ELMSLAB_OFFICER ElmsLab_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 6 - maptrigger .MeetElm - maptrigger .DummyTrigger1 - maptrigger .DummyTrigger2 - maptrigger .DummyTrigger3 - maptrigger .DummyTrigger4 - maptrigger .DummyTrigger5 + scene_script .MeetElm + scene_script .DummyScene1 + scene_script .DummyScene2 + scene_script .DummyScene3 + scene_script .DummyScene4 + scene_script .DummyScene5 .MapCallbacks: db 1 @@ -24,25 +24,25 @@ ElmsLab_MapScriptHeader: priorityjump .WalkUpToElm end -.DummyTrigger1: +.DummyScene1: end -.DummyTrigger2: +.DummyScene2: end -.DummyTrigger3: +.DummyScene3: end -.DummyTrigger4: +.DummyScene4: end -.DummyTrigger5: +.DummyScene5: end .MoveElmCallback: - checktriggers + checkscene iftrue .Skip - moveperson ELMSLAB_ELM, $3, $4 + moveobject ELMSLAB_ELM, $3, $4 .Skip: return @@ -84,7 +84,7 @@ ElmsLab_MapScriptHeader: opentext writetext ElmText_ChooseAPokemon waitbutton - dotrigger $1 + setscene $1 closetext end @@ -274,8 +274,8 @@ ElmDirectionsScript: closetext setevent EVENT_GOT_A_POKEMON_FROM_ELM setevent EVENT_RIVAL_CHERRYGROVE_CITY - dotrigger $5 - domaptrigger NEW_BARK_TOWN, $1 + setscene $5 + setmapscene NEW_BARK_TOWN, $1 end ElmDescribesMrPokemonScript: @@ -341,13 +341,13 @@ ElmAfterTheftScript: buttonsound setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM setflag ENGINE_BUG_CONTEST_ON - domaptrigger ROUTE_29, $1 + setmapscene ROUTE_29, $1 clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY setevent EVENT_ROUTE_30_BATTLE writetext ElmAfterTheftText6 waitbutton closetext - dotrigger $6 + setscene $6 end ElmStudyingEggScript: @@ -479,7 +479,7 @@ AideScript_GivePotions: writetext AideText_AlwaysBusy waitbutton closetext - dotrigger $2 + setscene $2 end AideScript_WalkBalls1: @@ -507,7 +507,7 @@ AideScript_GiveYouBalls: buttonsound itemnotify closetext - dotrigger $2 + setscene $2 end AideScript_ReceiveTheBalls: @@ -562,7 +562,7 @@ CopScript: closetext applymovement ELMSLAB_OFFICER, OfficerLeavesMovement disappear ELMSLAB_OFFICER - dotrigger $2 + setscene $2 end ElmsLabWindow: @@ -1379,41 +1379,41 @@ ElmsLab_MapEventHeader: warp_def $b, $4, 1, NEW_BARK_TOWN warp_def $b, $5, 1, NEW_BARK_TOWN -.XYTriggers: +.CoordEvents: db 8 - xy_trigger 1, $6, $4, LabTryToLeaveScript - xy_trigger 1, $6, $5, LabTryToLeaveScript - xy_trigger 3, $5, $4, MeetCopScript - xy_trigger 3, $5, $5, MeetCopScript2 - xy_trigger 5, $8, $4, AideScript_WalkPotions1 - xy_trigger 5, $8, $5, AideScript_WalkPotions2 - xy_trigger 6, $8, $4, AideScript_WalkBalls1 - xy_trigger 6, $8, $5, AideScript_WalkBalls2 + coord_event 1, $6, $4, LabTryToLeaveScript + coord_event 1, $6, $5, LabTryToLeaveScript + coord_event 3, $5, $4, MeetCopScript + coord_event 3, $5, $5, MeetCopScript2 + coord_event 5, $8, $4, AideScript_WalkPotions1 + coord_event 5, $8, $5, AideScript_WalkPotions2 + coord_event 6, $8, $4, AideScript_WalkBalls1 + coord_event 6, $8, $5, AideScript_WalkBalls2 -.Signposts: +.BGEvents: 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 + bg_event 1, 2, BGEVENT_READ, ElmsLabHealingMachine + bg_event 1, 6, BGEVENT_READ, ElmsLabBookshelf + bg_event 1, 7, BGEVENT_READ, ElmsLabBookshelf + bg_event 1, 8, BGEVENT_READ, ElmsLabBookshelf + bg_event 1, 9, BGEVENT_READ, ElmsLabBookshelf + bg_event 7, 0, BGEVENT_READ, ElmsLabTravelTip1 + bg_event 7, 1, BGEVENT_READ, ElmsLabTravelTip2 + bg_event 7, 2, BGEVENT_READ, ElmsLabTravelTip3 + bg_event 7, 3, BGEVENT_READ, ElmsLabTravelTip4 + bg_event 7, 6, BGEVENT_READ, ElmsLabBookshelf + bg_event 7, 7, BGEVENT_READ, ElmsLabBookshelf + bg_event 7, 8, BGEVENT_READ, ElmsLabBookshelf + bg_event 7, 9, BGEVENT_READ, ElmsLabBookshelf + bg_event 3, 9, BGEVENT_READ, ElmsLabTrashcan + bg_event 0, 5, BGEVENT_READ, ElmsLabWindow + bg_event 5, 3, BGEVENT_DOWN, ElmsLabPC -.PersonEvents: +.ObjectEvents: 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, PAL_NPC_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, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB + object_event SPRITE_ELM, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1 + object_event SPRITE_SCIENTIST, 9, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB + object_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB + object_event SPRITE_POKE_BALL, 3, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB + object_event SPRITE_POKE_BALL, 3, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB + object_event SPRITE_OFFICER, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index e54a9e3cd..f2e4337c3 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -5,23 +5,23 @@ const_value set 2 const FASTSHIP1F_GENTLEMAN FastShip1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 3 - maptrigger .DummyTrigger0 - maptrigger .EnterFastShip - maptrigger .DummyTrigger2 + scene_script .DummyScene0 + scene_script .EnterFastShip + scene_script .DummyScene2 .MapCallbacks: db 0 -.DummyTrigger0: +.DummyScene0: end .EnterFastShip: priorityjump .EnterFastShipScript end -.DummyTrigger2: +.DummyScene2: end .EnterFastShipScript: @@ -35,11 +35,11 @@ FastShip1F_MapScriptHeader: clearevent EVENT_FAST_SHIP_HAS_ARRIVED checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue .SkipGrandpa - dotrigger $2 + setscene $2 end .SkipGrandpa: - dotrigger $0 + setscene $0 end SailorScript_0x75160: @@ -71,7 +71,7 @@ SailorScript_0x75160: special FadeOutPalettes waitsfx setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY - domaptrigger VERMILION_PORT, $1 + setmapscene VERMILION_PORT, $1 warp VERMILION_PORT, $7, $11 end @@ -84,7 +84,7 @@ SailorScript_0x75160: special FadeOutPalettes waitsfx setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY - domaptrigger OLIVINE_PORT, $1 + setmapscene OLIVINE_PORT, $1 warp OLIVINE_PORT, $7, $17 end @@ -119,10 +119,10 @@ SailorScript_0x751d0: FastShip1FSailorScript: jumptextfaceplayer FastShip1FSailorText -WorriedGrandpaTriggerRight: - moveperson FASTSHIP1F_GENTLEMAN, $14, $6 +WorriedGrandpaSceneRight: + moveobject FASTSHIP1F_GENTLEMAN, $14, $6 -WorriedGrandpaTriggerLeft: +WorriedGrandpaSceneLeft: appear FASTSHIP1F_GENTLEMAN applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x7521b playsound SFX_TACKLE @@ -135,7 +135,7 @@ WorriedGrandpaTriggerLeft: spriteface PLAYER, RIGHT applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222 disappear FASTSHIP1F_GENTLEMAN - dotrigger $0 + setscene $0 end MovementData_0x7520e: @@ -304,17 +304,17 @@ FastShip1F_MapEventHeader: warp_def $c, $6, 1, FAST_SHIP_B1F warp_def $e, $1e, 2, FAST_SHIP_B1F -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 2, $6, $18, WorriedGrandpaTriggerLeft - xy_trigger 2, $6, $19, WorriedGrandpaTriggerRight + coord_event 2, $6, $18, WorriedGrandpaSceneLeft + coord_event 2, $6, $19, WorriedGrandpaSceneRight -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_SAILOR, 2, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x75160, -1 - person_event SPRITE_SAILOR, 7, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x751d0, -1 - person_event SPRITE_SAILOR, 17, 22, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FastShip1FSailorScript, -1 - person_event SPRITE_GENTLEMAN, 6, 19, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN + object_event SPRITE_SAILOR, 2, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x75160, -1 + object_event SPRITE_SAILOR, 7, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x751d0, -1 + object_event SPRITE_SAILOR, 17, 22, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailorScript, -1 + object_event SPRITE_GENTLEMAN, 6, 19, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 0069b5a86..73c8838db 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -13,25 +13,25 @@ const_value set 2 const FASTSHIPB1F_YOUNGSTER2 FastShipB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end UnknownScript_0x7673c: checkevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT iftrue UnknownScript_0x76766 applymovement FASTSHIPB1F_SAILOR2, MovementData_0x76876 - moveperson FASTSHIPB1F_SAILOR1, $1e, $6 + moveobject FASTSHIPB1F_SAILOR1, $1e, $6 appear FASTSHIPB1F_SAILOR1 pause 5 disappear FASTSHIPB1F_SAILOR2 @@ -41,7 +41,7 @@ UnknownScript_0x76751: checkevent EVENT_FAST_SHIP_B1F_SAILOR_LEFT iftrue UnknownScript_0x76766 applymovement FASTSHIPB1F_SAILOR1, MovementData_0x76871 - moveperson FASTSHIPB1F_SAILOR2, $1f, $6 + moveobject FASTSHIPB1F_SAILOR2, $1f, $6 appear FASTSHIPB1F_SAILOR2 pause 5 disappear FASTSHIPB1F_SAILOR1 @@ -457,26 +457,26 @@ FastShipB1F_MapEventHeader: warp_def $b, $5, 11, FAST_SHIP_1F warp_def $d, $1f, 12, FAST_SHIP_1F -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $7, $1e, UnknownScript_0x7673c - xy_trigger 0, $7, $1f, UnknownScript_0x76751 + coord_event 0, $7, $1e, UnknownScript_0x7673c + coord_event 0, $7, $1f, UnknownScript_0x76751 -.Signposts: +.BGEvents: db 1 - signpost 9, 27, SIGNPOST_READ, FashShipB1FTrashcan + bg_event 9, 27, BGEVENT_READ, FashShipB1FTrashcan -.PersonEvents: +.ObjectEvents: db 12 - person_event SPRITE_SAILOR, 6, 30, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT - person_event SPRITE_SAILOR, 6, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT - person_event SPRITE_SAILOR, 11, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_LASS, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_SUPER_NERD, 9, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_SAILOR, 4, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_FISHER, 8, 25, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_BLACK_BELT, 11, 15, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_SAILOR, 4, 23, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_TEACHER, 11, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_YOUNGSTER, 11, 14, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_SAILOR, 6, 30, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT + object_event SPRITE_SAILOR, 6, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT + object_event SPRITE_SAILOR, 11, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event SPRITE_LASS, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event SPRITE_SUPER_NERD, 9, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event SPRITE_SAILOR, 4, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event SPRITE_FISHER, 8, 25, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event SPRITE_BLACK_BELT, 11, 15, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event SPRITE_SAILOR, 4, 23, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_TEACHER, 11, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_YOUNGSTER, 11, 14, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 2f141db45..013b2ad17 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -8,7 +8,7 @@ const_value set 2 const FASTSHIPCABINS_NNW_NNE_NE_PHARMACIST FastShipCabins_NNW_NNE_NE_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -98,7 +98,7 @@ SailorScript_0x755f1: waitbutton closetext setevent EVENT_FAST_SHIP_LAZY_SAILOR - domaptrigger FAST_SHIP_B1F, $1 + setmapscene FAST_SHIP_B1F, $1 checkcode VAR_FACING if_equal $3, UnknownScript_0x75629 applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637 @@ -276,21 +276,21 @@ FastShipCabins_NNW_NNE_NE_MapEventHeader: warp_def $c, $2, 3, FAST_SHIP_1F warp_def $18, $2, 4, FAST_SHIP_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 13, 6, SIGNPOST_READ, FastShipCabins_NNW_NNE_NETrashcan - signpost 19, 7, SIGNPOST_READ, FastShipCabins_NNW_NNE_NETrashcan - signpost 31, 7, SIGNPOST_READ, FastShipCabins_NNW_NNE_NETrashcan + bg_event 13, 6, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan + bg_event 19, 7, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan + bg_event 31, 7, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_COOLTRAINER_M, 3, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_COOLTRAINER_F, 5, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_SUPER_NERD, 5, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_POKEFAN_M, 17, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_SAILOR, 26, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR - person_event SPRITE_GENTLEMAN, 30, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_PHARMACIST, 30, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_COOLTRAINER_M, 3, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event SPRITE_COOLTRAINER_F, 5, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event SPRITE_SUPER_NERD, 5, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_POKEFAN_M, 17, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event SPRITE_SAILOR, 26, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR + object_event SPRITE_GENTLEMAN, 30, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event SPRITE_PHARMACIST, 30, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 8e0575964..f3435833c 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -12,7 +12,7 @@ const_value set 2 const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD2 FastShipCabins_SE_SSE_CaptainsCabin_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -52,7 +52,7 @@ TwinScript_0x75ebb: special Special_ReloadSpritesNoPalettes disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2 applymovement PLAYER, MovementData_0x76004 - moveperson FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, $3, $13 + moveobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, $3, $13 appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1 spriteface PLAYER, UP spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP @@ -81,7 +81,7 @@ UnknownScript_0x75f09: writetext UnknownText_0x76143 buttonsound setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY - domaptrigger FAST_SHIP_1F, $0 + setmapscene FAST_SHIP_1F, $0 jump UnknownScript_0x75f37 GentlemanScript_0x75f1f: @@ -94,7 +94,7 @@ GentlemanScript_0x75f1f: writetext UnknownText_0x760ae waitbutton closetext - domaptrigger FAST_SHIP_1F, $0 + setmapscene FAST_SHIP_1F, $0 end UnknownScript_0x75f37: @@ -475,23 +475,23 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: warp_def $21, $2, 10, FAST_SHIP_1F warp_def $21, $3, 10, FAST_SHIP_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 25, 4, SIGNPOST_READ, FastShipCaptainsCabinTrashcan + bg_event 25, 4, BGEVENT_READ, FastShipCaptainsCabinTrashcan -.PersonEvents: +.ObjectEvents: db 11 - person_event SPRITE_CAPTAIN, 25, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CaptainScript_0x75ea7, -1 - person_event SPRITE_GENTLEMAN, 17, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x75f1f, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN - person_event SPRITE_TWIN, 17, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TwinScript_0x75f6d, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 - person_event SPRITE_TWIN, 25, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TwinScript_0x75ebb, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 - person_event SPRITE_POKEFAN_M, 6, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_TWIN, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_SUPER_NERD, 5, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_POKEFAN_F, 5, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_SUPER_NERD, 15, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event SPRITE_CAPTAIN, 25, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CaptainScript_0x75ea7, -1 + object_event SPRITE_GENTLEMAN, 17, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x75f1f, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN + object_event SPRITE_TWIN, 17, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x75f6d, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 + object_event SPRITE_TWIN, 25, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x75ebb, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 + object_event SPRITE_POKEFAN_M, 6, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event SPRITE_TWIN, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event SPRITE_SUPER_NERD, 5, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_POKEFAN_F, 5, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_SUPER_NERD, 15, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index b1430f1c4..f2a7717f6 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -5,7 +5,7 @@ const_value set 2 const FASTSHIPCABINS_SW_SSW_NW_ROCKER FastShipCabins_SW_SSW_NW_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -234,18 +234,18 @@ FastShipCabins_SW_SSW_NW_MapEventHeader: warp_def $1f, $2, 7, FAST_SHIP_1F warp_def $1f, $3, 7, FAST_SHIP_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 1, 7, SIGNPOST_READ, FastShipBed - signpost 2, 7, SIGNPOST_READ, FastShipBed - signpost 7, 7, SIGNPOST_READ, FastShipCabinsNorthwestCabinTrashcan + bg_event 1, 7, BGEVENT_READ, FastShipBed + bg_event 2, 7, BGEVENT_READ, FastShipBed + bg_event 7, 7, BGEVENT_READ, FastShipCabinsNorthwestCabinTrashcan -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_FISHER, 15, 1, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_BUG_CATCHER, 15, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerBug_catcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_BUENA, 26, 1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_ROCKER, 28, 3, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_FISHER, 15, 1, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event SPRITE_BUG_CATCHER, 15, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBug_catcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_BUENA, 26, 1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event SPRITE_ROCKER, 28, 3, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 2487adefd..9507e9a26 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -3,7 +3,7 @@ const_value set 2 const FIGHTINGDOJO_POKE_BALL FightingDojo_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -51,15 +51,15 @@ FightingDojo_MapEventHeader: warp_def $b, $4, 1, SAFFRON_CITY warp_def $b, $5, 1, SAFFRON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 4, SIGNPOST_READ, MapFightingDojoSignpost0Script - signpost 0, 5, SIGNPOST_READ, MapFightingDojoSignpost1Script + bg_event 0, 4, BGEVENT_READ, MapFightingDojoSignpost0Script + bg_event 0, 5, BGEVENT_READ, MapFightingDojoSignpost1Script -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_BLACK_BELT, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1 - person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND + object_event SPRITE_BLACK_BELT, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1 + object_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm index 2b420775b..3a0758a39 100644 --- a/maps/FuchsiaBillSpeechHouse.asm +++ b/maps/FuchsiaBillSpeechHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const FUCHSIABILLSPEECHHOUSE_YOUNGSTER FuchsiaBillSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -36,13 +36,13 @@ FuchsiaBillSpeechHouse_MapEventHeader: warp_def $7, $2, 4, FUCHSIA_CITY warp_def $7, $3, 4, FUCHSIA_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FuchsiaBillSpeechHousePokefanFScript, -1 - person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FuchsiaBillSpeechHouseYoungsterScript, -1 + object_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHousePokefanFScript, -1 + object_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHouseYoungsterScript, -1 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index f13245e68..97a6f2363 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -5,7 +5,7 @@ const_value set 2 const FUCHSIACITY_FRUIT_TREE FuchsiaCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -142,23 +142,23 @@ FuchsiaCity_MapEventHeader: warp_def $23, $7, 1, ROUTE_19___FUCHSIA_GATE warp_def $23, $8, 2, ROUTE_19___FUCHSIA_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 8 - signpost 15, 21, SIGNPOST_READ, FuchsiaCitySign - signpost 29, 5, SIGNPOST_READ, FuchsiaGymSign - signpost 15, 25, SIGNPOST_READ, SafariZoneOfficeSign - signpost 29, 27, SIGNPOST_READ, WardensHomeSign - signpost 5, 17, SIGNPOST_READ, SafariZoneClosedSign - signpost 15, 13, SIGNPOST_READ, NoLitteringSign - signpost 27, 20, SIGNPOST_READ, FuchsiaCityPokecenterSign - signpost 13, 6, SIGNPOST_READ, FuchsiaCityMartSign + bg_event 15, 21, BGEVENT_READ, FuchsiaCitySign + bg_event 29, 5, BGEVENT_READ, FuchsiaGymSign + bg_event 15, 25, BGEVENT_READ, SafariZoneOfficeSign + bg_event 29, 27, BGEVENT_READ, WardensHomeSign + bg_event 5, 17, BGEVENT_READ, SafariZoneClosedSign + bg_event 15, 13, BGEVENT_READ, NoLitteringSign + bg_event 27, 20, BGEVENT_READ, FuchsiaCityPokecenterSign + bg_event 13, 6, BGEVENT_READ, FuchsiaCityMartSign -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_YOUNGSTER, 18, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1 - person_event SPRITE_POKEFAN_M, 8, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1 - person_event SPRITE_TEACHER, 14, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1 - person_event SPRITE_FRUIT_TREE, 1, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1 + object_event SPRITE_YOUNGSTER, 18, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1 + object_event SPRITE_POKEFAN_M, 8, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1 + object_event SPRITE_TEACHER, 14, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1 + object_event SPRITE_FRUIT_TREE, 1, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 23c33965f..7d3caac18 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -7,7 +7,7 @@ const_value set 2 const FUCHSIAGYM_GYM_GUY FuchsiaGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -389,19 +389,19 @@ FuchsiaGym_MapEventHeader: warp_def $11, $4, 3, FUCHSIA_CITY warp_def $11, $5, 3, FUCHSIA_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 15, 3, SIGNPOST_READ, FuchsiaGymStatue - signpost 15, 6, SIGNPOST_READ, FuchsiaGymStatue + bg_event 15, 3, BGEVENT_READ, FuchsiaGymStatue + bg_event 15, 6, BGEVENT_READ, FuchsiaGymStatue -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_JANINE, 10, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1 - person_event SPRITE_FUCHSIA_GYM_1, 7, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LassAliceScript, -1 - person_event SPRITE_FUCHSIA_GYM_2, 11, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LassLindaScript, -1 - person_event SPRITE_FUCHSIA_GYM_3, 4, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PicnickerCindyScript, -1 - person_event SPRITE_FUCHSIA_GYM_4, 2, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CamperBarryScript, -1 - person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FuchsiaGymGuyScript, -1 + object_event SPRITE_JANINE, 10, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1 + object_event SPRITE_FUCHSIA_GYM_1, 7, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassAliceScript, -1 + object_event SPRITE_FUCHSIA_GYM_2, 11, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassLindaScript, -1 + object_event SPRITE_FUCHSIA_GYM_3, 4, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PicnickerCindyScript, -1 + object_event SPRITE_FUCHSIA_GYM_4, 2, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CamperBarryScript, -1 + object_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymGuyScript, -1 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 7e123e721..05266ecee 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -4,7 +4,7 @@ const_value set 2 const FUCHSIAMART_COOLTRAINER_F FuchsiaMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -46,14 +46,14 @@ FuchsiaMart_MapEventHeader: warp_def $7, $2, 1, FUCHSIA_CITY warp_def $7, $3, 1, FUCHSIA_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1 - person_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1 - person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1 + object_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1 + object_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1 diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index d275eaece..7afc161e2 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -5,14 +5,14 @@ const_value set 2 const FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR FuchsiaPokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - maptrigger .DummyTrigger + scene_script .DummyScene .MapCallbacks: db 0 -.DummyTrigger: +.DummyScene: end NurseScript_0x196459: @@ -98,15 +98,15 @@ FuchsiaPokecenter1F_MapEventHeader: warp_def $7, $4, 5, FUCHSIA_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, NurseScript_0x196459, -1 - person_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1 - person_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1 - person_event SPRITE_JANINE_IMPERSONATOR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NurseScript_0x196459, -1 + object_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1 + object_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1 + object_event SPRITE_JANINE_IMPERSONATOR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1 diff --git a/maps/FuchsiaPokecenter2FBeta.asm b/maps/FuchsiaPokecenter2FBeta.asm index a8deeae42..90cb6de5d 100644 --- a/maps/FuchsiaPokecenter2FBeta.asm +++ b/maps/FuchsiaPokecenter2FBeta.asm @@ -1,5 +1,5 @@ FuchsiaPokecenter2FBeta_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -13,11 +13,11 @@ FuchsiaPokecenter2FBeta_MapEventHeader: db 1 warp_def $7, $0, 3, FUCHSIA_POKECENTER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 1f094228d..1d83e2dfe 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -2,7 +2,7 @@ const_value set 2 const GOLDENRODBIKESHOP_CLERK GoldenrodBikeShop_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -111,21 +111,21 @@ GoldenrodBikeShop_MapEventHeader: warp_def $7, $2, 2, GOLDENROD_CITY warp_def $7, $3, 2, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 9 - signpost 2, 1, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script - signpost 3, 0, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script - signpost 3, 1, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script - signpost 5, 0, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script - signpost 5, 1, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script - signpost 6, 0, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script - signpost 6, 1, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script - signpost 6, 6, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script - signpost 6, 7, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 2, 1, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 3, 0, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 3, 1, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 5, 0, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 5, 1, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 6, 0, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 6, 1, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 6, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 6, 7, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_CLERK, 2, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ClerkScript_0x54750, -1 + object_event SPRITE_CLERK, 2, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x54750, -1 diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 045c5d57f..71e44841a 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -4,7 +4,7 @@ const_value set 2 const GOLDENRODBILLSHOUSE_TWIN GoldenrodBillsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -251,17 +251,17 @@ GoldenrodBillsHouse_MapEventHeader: warp_def $7, $2, 4, GOLDENROD_CITY warp_def $7, $3, 4, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 1, 0, SIGNPOST_READ, BillsHouseBookshelf2 - signpost 1, 1, SIGNPOST_READ, BillsHouseBookshelf1 - signpost 1, 7, SIGNPOST_READ, BillsHouseRadio + bg_event 1, 0, BGEVENT_READ, BillsHouseBookshelf2 + bg_event 1, 1, BGEVENT_READ, BillsHouseBookshelf1 + bg_event 1, 7, BGEVENT_READ, BillsHouseRadio -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_BILL, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BillsHouseBill, EVENT_MET_BILL - person_event SPRITE_POKEFAN_F, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BillsMom, -1 - person_event SPRITE_TWIN, 4, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BillsSister, -1 + object_event SPRITE_BILL, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsHouseBill, EVENT_MET_BILL + object_event SPRITE_POKEFAN_F, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMom, -1 + object_event SPRITE_TWIN, 4, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSister, -1 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 74aedf8a7..8d2beffe8 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -16,7 +16,7 @@ const_value set 2 const GOLDENRODCITY_POKEFAN_M2 GoldenrodCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -576,38 +576,38 @@ GoldenrodCity_MapEventHeader: warp_def $1d, $b, 5, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES warp_def $1b, $f, 1, GOLDENROD_POKECENTER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 12 - signpost 14, 10, SIGNPOST_READ, GoldenrodCityStationSign - signpost 17, 4, SIGNPOST_READ, GoldenrodCityRadioTowerSign - signpost 27, 26, SIGNPOST_READ, GoldenrodDeptStoreSign - signpost 9, 26, SIGNPOST_READ, GoldenrodGymSign - signpost 18, 22, SIGNPOST_READ, GoldenrodCitySign - signpost 30, 28, SIGNPOST_READ, GoldenrodCityBikeShopSign - signpost 22, 16, SIGNPOST_READ, GoldenrodCityGameCornerSign - signpost 7, 12, SIGNPOST_READ, GoldenrodCityNameRaterSign - signpost 6, 8, SIGNPOST_READ, GoldenrodCityUndergroundSignNorth - signpost 30, 12, SIGNPOST_READ, GoldenrodCityUndergroundSignSouth - signpost 27, 16, SIGNPOST_UP, GoldenrodCityPokecenterSign - signpost 6, 30, SIGNPOST_READ, GoldenrodCityFlowerShopSign + bg_event 14, 10, BGEVENT_READ, GoldenrodCityStationSign + bg_event 17, 4, BGEVENT_READ, GoldenrodCityRadioTowerSign + bg_event 27, 26, BGEVENT_READ, GoldenrodDeptStoreSign + bg_event 9, 26, BGEVENT_READ, GoldenrodGymSign + bg_event 18, 22, BGEVENT_READ, GoldenrodCitySign + bg_event 30, 28, BGEVENT_READ, GoldenrodCityBikeShopSign + bg_event 22, 16, BGEVENT_READ, GoldenrodCityGameCornerSign + bg_event 7, 12, BGEVENT_READ, GoldenrodCityNameRaterSign + bg_event 6, 8, BGEVENT_READ, GoldenrodCityUndergroundSignNorth + bg_event 30, 12, BGEVENT_READ, GoldenrodCityUndergroundSignSouth + bg_event 27, 16, BGEVENT_UP, GoldenrodCityPokecenterSign + bg_event 6, 30, BGEVENT_READ, GoldenrodCityFlowerShopSign -.PersonEvents: +.ObjectEvents: db 15 - person_event SPRITE_POKEFAN_M, 18, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_YOUNGSTER, 17, 30, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_COOLTRAINER_F, 16, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_COOLTRAINER_F, 26, 20, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_YOUNGSTER, 17, 19, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodCityYoungster2Script, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_LASS, 10, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodCityLassScript, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_GRAMPS, 27, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityGrampsScript, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_ROCKET, 16, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocketScoutScript, EVENT_GOLDENROD_CITY_ROCKET_SCOUT - person_event SPRITE_ROCKET, 20, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocket1Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocket2Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 23, 16, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocket3Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 20, 29, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocket4Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 7, 29, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 10, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocket6Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_POKEFAN_M, 22, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR + object_event SPRITE_POKEFAN_M, 18, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_YOUNGSTER, 17, 30, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_COOLTRAINER_F, 16, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_COOLTRAINER_F, 26, 20, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_YOUNGSTER, 17, 19, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster2Script, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_LASS, 10, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodCityLassScript, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_GRAMPS, 27, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityGrampsScript, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_ROCKET, 16, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocketScoutScript, EVENT_GOLDENROD_CITY_ROCKET_SCOUT + object_event SPRITE_ROCKET, 20, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket1Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket2Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 23, 16, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket3Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 20, 29, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket4Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 7, 29, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 10, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket6Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_POKEFAN_M, 22, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 7b9671054..9fd609dee 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -5,7 +5,7 @@ const_value set 2 const GOLDENRODDEPTSTORE1F_GENTLEMAN GoldenrodDeptStore1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -89,17 +89,17 @@ GoldenrodDeptStore1F_MapEventHeader: warp_def $0, $f, 2, GOLDENROD_DEPT_STORE_2F warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore1FDirectory - signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore1FElevatorButton + bg_event 0, 14, BGEVENT_READ, GoldenrodDeptStore1FDirectory + bg_event 0, 3, BGEVENT_READ, GoldenrodDeptStore1FElevatorButton -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1 - person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1 - person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1 - person_event SPRITE_GENTLEMAN, 5, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore1FGentlemanScript, -1 + object_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1 + object_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1 + object_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1 + object_event SPRITE_GENTLEMAN, 5, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FGentlemanScript, -1 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index 41e929bda..d1d827c52 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -6,7 +6,7 @@ const_value set 2 const GOLDENRODDEPTSTORE2F_GENTLEMAN GoldenrodDeptStore2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -110,18 +110,18 @@ GoldenrodDeptStore2F_MapEventHeader: warp_def $0, $f, 3, GOLDENROD_DEPT_STORE_1F warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore2FDirectory - signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore2FElevatorButton + bg_event 0, 14, BGEVENT_READ, GoldenrodDeptStore2FDirectory + bg_event 0, 3, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1 - person_event SPRITE_CLERK, 6, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1 - person_event SPRITE_YOUNGSTER, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore2FCooltrainerFScript, -1 - person_event SPRITE_GENTLEMAN, 6, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore2FGentlemanScript, -1 + object_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1 + object_event SPRITE_CLERK, 6, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1 + object_event SPRITE_YOUNGSTER, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1 + object_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FCooltrainerFScript, -1 + object_event SPRITE_GENTLEMAN, 6, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FGentlemanScript, -1 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index ec07b0a72..94765e409 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -4,7 +4,7 @@ const_value set 2 const GOLDENRODDEPTSTORE3F_ROCKER GoldenrodDeptStore3F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -66,16 +66,16 @@ GoldenrodDeptStore3F_MapEventHeader: warp_def $0, $f, 2, GOLDENROD_DEPT_STORE_4F warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore3FDirectory - signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore3FElevatorButton + bg_event 0, 14, BGEVENT_READ, GoldenrodDeptStore3FDirectory + bg_event 0, 3, BGEVENT_READ, GoldenrodDeptStore3FElevatorButton -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1 - person_event SPRITE_SUPER_NERD, 5, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1 - person_event SPRITE_ROCKER, 5, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1 + object_event SPRITE_CLERK, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1 + object_event SPRITE_SUPER_NERD, 5, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1 + object_event SPRITE_ROCKER, 5, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 8e8fc4714..c12de0391 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -5,7 +5,7 @@ const_value set 2 const GOLDENRODDEPTSTORE4F_GAMEBOY_KID GoldenrodDeptStore4F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -87,17 +87,17 @@ GoldenrodDeptStore4F_MapEventHeader: warp_def $0, $f, 2, GOLDENROD_DEPT_STORE_3F warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore4FDirectory - signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore4FElevatorButton + bg_event 0, 14, BGEVENT_READ, GoldenrodDeptStore4FDirectory + bg_event 0, 3, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1 - person_event SPRITE_COOLTRAINER_M, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1 - person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1 - person_event SPRITE_GAMEBOY_KID, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x55ef7, -1 + object_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1 + object_event SPRITE_COOLTRAINER_M, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1 + object_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1 + object_event SPRITE_GAMEBOY_KID, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x55ef7, -1 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index e4b99959e..7c358cd18 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -7,7 +7,7 @@ const_value set 2 const GOLDENRODDEPTSTORE5F_RECEPTIONIST GoldenrodDeptStore5F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -227,19 +227,19 @@ GoldenrodDeptStore5F_MapEventHeader: warp_def $0, $f, 1, GOLDENROD_DEPT_STORE_6F warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore5FDirectory - signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore5FElevatorButton + bg_event 0, 14, BGEVENT_READ, GoldenrodDeptStore5FDirectory + bg_event 0, 3, BGEVENT_READ, GoldenrodDeptStore5FElevatorButton -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1 - person_event SPRITE_LASS, 6, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1 - person_event SPRITE_COOLTRAINER_M, 3, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Mike, -1 - person_event SPRITE_POKEFAN_M, 5, 13, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore5FPokefanMScript, -1 - person_event SPRITE_TWIN, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Carrie, -1 - person_event SPRITE_RECEPTIONIST, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY + object_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1 + object_event SPRITE_LASS, 6, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1 + object_event SPRITE_COOLTRAINER_M, 3, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Mike, -1 + object_event SPRITE_POKEFAN_M, 5, 13, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FPokefanMScript, -1 + object_event SPRITE_TWIN, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Carrie, -1 + object_event SPRITE_RECEPTIONIST, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 18c936e81..f3fd44501 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -3,7 +3,7 @@ const_value set 2 const GOLDENRODDEPTSTORE6F_SUPER_NERD GoldenrodDeptStore6F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -159,19 +159,19 @@ GoldenrodDeptStore6F_MapEventHeader: warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR warp_def $0, $d, 1, GOLDENROD_DEPT_STORE_ROOF -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore6FDirectory - signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore6FElevatorButton - signpost 1, 8, SIGNPOST_UP, GoldenrodVendingMachine - signpost 1, 9, SIGNPOST_UP, GoldenrodVendingMachine - signpost 1, 10, SIGNPOST_UP, GoldenrodVendingMachine - signpost 1, 11, SIGNPOST_UP, GoldenrodVendingMachine + bg_event 0, 14, BGEVENT_READ, GoldenrodDeptStore6FDirectory + bg_event 0, 3, BGEVENT_READ, GoldenrodDeptStore6FElevatorButton + bg_event 1, 8, BGEVENT_UP, GoldenrodVendingMachine + bg_event 1, 9, BGEVENT_UP, GoldenrodVendingMachine + bg_event 1, 10, BGEVENT_UP, GoldenrodVendingMachine + bg_event 1, 11, BGEVENT_UP, GoldenrodVendingMachine -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_LASS, 2, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore6FLassScript, -1 - person_event SPRITE_SUPER_NERD, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore6FSuperNerdScript, -1 + object_event SPRITE_LASS, 2, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FLassScript, -1 + object_event SPRITE_SUPER_NERD, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FSuperNerdScript, -1 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 4e6a3b03e..a00eb1762 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -9,7 +9,7 @@ const_value set 2 const GOLDENRODDEPTSTOREB1F_MACHOP GoldenrodDeptStoreB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -119,19 +119,19 @@ GoldenrodDeptStoreB1F_MapEventHeader: warp_def $4, $9, 1, GOLDENROD_DEPT_STORE_ELEVATOR warp_def $4, $a, 2, GOLDENROD_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 8 - person_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER - person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN - person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL - person_event SPRITE_POKE_BALL, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL - person_event SPRITE_BLACK_BELT, 10, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt1Script, -1 - person_event SPRITE_BLACK_BELT, 8, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt2Script, -1 - person_event SPRITE_BLACK_BELT, 13, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt3Script, -1 - person_event SPRITE_MACHOP, 7, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, MachopScript_0x7d7b9, -1 + object_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER + object_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN + object_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL + object_event SPRITE_POKE_BALL, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL + object_event SPRITE_BLACK_BELT, 10, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt1Script, -1 + object_event SPRITE_BLACK_BELT, 8, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt2Script, -1 + object_event SPRITE_BLACK_BELT, 13, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt3Script, -1 + object_event SPRITE_MACHOP, 7, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MachopScript_0x7d7b9, -1 diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 82f14b404..03d637930 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -1,5 +1,5 @@ GoldenrodDeptStoreElevator_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -65,12 +65,12 @@ GoldenrodDeptStoreElevator_MapEventHeader: warp_def $3, $1, -1, GOLDENROD_DEPT_STORE_1F warp_def $3, $2, -1, GOLDENROD_DEPT_STORE_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 0, 3, SIGNPOST_READ, MapGoldenrodDeptStoreElevatorSignpost0Script + bg_event 0, 3, BGEVENT_READ, MapGoldenrodDeptStoreElevatorSignpost0Script -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index bfdc3a527..f60970e64 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -9,7 +9,7 @@ const_value set 2 const GOLDENRODDEPTSTOREROOF_BUG_CATCHER GoldenrodDeptStoreRoof_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -219,23 +219,23 @@ GoldenrodDeptStoreRoof_MapEventHeader: db 1 warp_def $1, $d, 3, GOLDENROD_DEPT_STORE_6F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 3, 15, SIGNPOST_RIGHT, Binoculars1 - signpost 5, 15, SIGNPOST_RIGHT, Binoculars2 - signpost 6, 15, SIGNPOST_RIGHT, Binoculars3 - signpost 0, 3, SIGNPOST_UP, PokeDollVendingMachine + bg_event 3, 15, BGEVENT_RIGHT, Binoculars1 + bg_event 5, 15, BGEVENT_RIGHT, Binoculars2 + bg_event 6, 15, BGEVENT_RIGHT, Binoculars3 + bg_event 0, 3, BGEVENT_UP, PokeDollVendingMachine -.PersonEvents: +.ObjectEvents: db 8 - person_event SPRITE_CLERK, 4, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF - person_event SPRITE_POKEFAN_F, 3, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1 - person_event SPRITE_FISHER, 1, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FisherScript_0x56749, -1 - person_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTwinScript, EVENT_GOLDENROD_SALE_ON - person_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON - person_event SPRITE_POKEFAN_M, 0, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanMScript, EVENT_GOLDENROD_SALE_OFF - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTeacherScript, EVENT_GOLDENROD_SALE_OFF - person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofBugCatcherScript, EVENT_GOLDENROD_SALE_OFF + object_event SPRITE_CLERK, 4, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF + object_event SPRITE_POKEFAN_F, 3, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1 + object_event SPRITE_FISHER, 1, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x56749, -1 + object_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTwinScript, EVENT_GOLDENROD_SALE_ON + object_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON + object_event SPRITE_POKEFAN_M, 0, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanMScript, EVENT_GOLDENROD_SALE_OFF + object_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTeacherScript, EVENT_GOLDENROD_SALE_OFF + object_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofBugCatcherScript, EVENT_GOLDENROD_SALE_OFF diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 3f37d842a..974484112 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -3,7 +3,7 @@ const_value set 2 const GOLDENRODFLOWERSHOP_FLORIA GoldenrodFlowerShop_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -168,13 +168,13 @@ GoldenrodFlowerShop_MapEventHeader: warp_def $7, $2, 6, GOLDENROD_CITY warp_def $7, $3, 6, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FlowerShopTeacherScript, -1 - person_event SPRITE_LASS, 6, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP + object_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FlowerShopTeacherScript, -1 + object_event SPRITE_LASS, 6, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 500ce0017..8a57e3ef0 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -13,7 +13,7 @@ const_value set 2 const GOLDENRODGAMECORNER_POKEFAN_M3 GoldenrodGameCorner_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -451,54 +451,54 @@ GoldenrodGameCorner_MapEventHeader: warp_def $d, $2, 10, GOLDENROD_CITY warp_def $d, $3, 10, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 31 - signpost 6, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 7, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 8, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 9, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 10, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 11, 6, SIGNPOST_RIGHT, GoldenrodGameCornerSlotsMachineScript - signpost 6, 7, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 7, 7, SIGNPOST_READ, GoldenrodGameCornerLuckySlotsMachineScript - signpost 8, 7, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 9, 7, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 10, 7, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 11, 7, SIGNPOST_LEFT, GoldenrodGameCornerSlotsMachineScript - signpost 6, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 7, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 8, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 9, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 10, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 11, 12, SIGNPOST_RIGHT, GoldenrodGameCornerSlotsMachineScript - signpost 6, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 7, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 8, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 9, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 10, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 11, 13, SIGNPOST_LEFT, GoldenrodGameCornerCardFlipMachineScript - signpost 6, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 7, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 8, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 9, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 10, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 11, 18, SIGNPOST_RIGHT, GoldenrodGameCornerCardFlipMachineScript - signpost 1, 12, SIGNPOST_LEFT, GoldenrodGameCornerLeftTheirDrinkScript + bg_event 6, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 7, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 8, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 9, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 10, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 11, 6, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript + bg_event 6, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 7, 7, BGEVENT_READ, GoldenrodGameCornerLuckySlotsMachineScript + bg_event 8, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 9, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 10, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 11, 7, BGEVENT_LEFT, GoldenrodGameCornerSlotsMachineScript + bg_event 6, 12, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 7, 12, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 8, 12, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 9, 12, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 10, 12, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 11, 12, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript + bg_event 6, 13, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 7, 13, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 8, 13, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 9, 13, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 10, 13, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 11, 13, BGEVENT_LEFT, GoldenrodGameCornerCardFlipMachineScript + bg_event 6, 18, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 7, 18, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 8, 18, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 9, 18, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 10, 18, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 11, 18, BGEVENT_RIGHT, GoldenrodGameCornerCardFlipMachineScript + bg_event 1, 12, BGEVENT_LEFT, GoldenrodGameCornerLeftTheirDrinkScript -.PersonEvents: +.ObjectEvents: db 12 - person_event SPRITE_CLERK, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1 - person_event SPRITE_RECEPTIONIST, 2, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1 - person_event SPRITE_RECEPTIONIST, 2, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1 - person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 - person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 - person_event SPRITE_POKEFAN_M, 10, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM1Script, -1 - person_event SPRITE_COOLTRAINER_M, 8, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1 - person_event SPRITE_POKEFAN_F, 6, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1 - person_event SPRITE_COOLTRAINER_F, 3, 10, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1 - person_event SPRITE_GENTLEMAN, 10, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1 - person_event SPRITE_POKEFAN_M, 9, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1 - person_event SPRITE_POKEFAN_M, 10, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM3Script, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR + object_event SPRITE_CLERK, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1 + object_event SPRITE_RECEPTIONIST, 2, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1 + object_event SPRITE_RECEPTIONIST, 2, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1 + object_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 + object_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 + object_event SPRITE_POKEFAN_M, 10, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM1Script, -1 + object_event SPRITE_COOLTRAINER_M, 8, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1 + object_event SPRITE_POKEFAN_F, 6, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1 + object_event SPRITE_COOLTRAINER_F, 3, 10, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1 + object_event SPRITE_GENTLEMAN, 10, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1 + object_event SPRITE_POKEFAN_M, 9, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1 + object_event SPRITE_POKEFAN_M, 10, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM3Script, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 3551b7ee7..19bb2400b 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -7,18 +7,18 @@ const_value set 2 const GOLDENRODGYM_GYM_GUY GoldenrodGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end WhitneyScript_0x5400c: @@ -35,7 +35,7 @@ WhitneyScript_0x5400c: reloadmapafterbattle setevent EVENT_BEAT_WHITNEY setevent EVENT_MADE_WHITNEY_CRY - dotrigger $1 + setscene $1 setevent EVENT_BEAT_BEAUTY_VICTORIA setevent EVENT_BEAT_BEAUTY_SAMANTHA setevent EVENT_BEAT_LASS_CARRIE @@ -62,7 +62,7 @@ WhitneyScript_0x5400c: waitsfx setflag ENGINE_PLAINBADGE checkcode VAR_BADGES - scall GoldenrodGymTriggerRockets + scall GoldenrodGymActivateRockets UnknownScript_0x54064: writetext UnknownText_0x5428b buttonsound @@ -81,7 +81,7 @@ UnknownScript_0x5407b: closetext end -GoldenrodGymTriggerRockets: +GoldenrodGymActivateRockets: if_equal 7, .RadioTowerRockets if_equal 6, .GoldenrodRockets end @@ -112,7 +112,7 @@ WhitneyCriesScript: waitbutton closetext applymovement GOLDENRODGYM_LASS2, BridgetWalksAwayMovement - dotrigger $0 + setscene $0 clearevent EVENT_MADE_WHITNEY_CRY end @@ -388,20 +388,20 @@ GoldenrodGym_MapEventHeader: warp_def $11, $2, 1, GOLDENROD_CITY warp_def $11, $3, 1, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 1, $5, $8, WhitneyCriesScript + coord_event 1, $5, $8, WhitneyCriesScript -.Signposts: +.BGEvents: db 2 - signpost 15, 1, SIGNPOST_READ, GoldenrodGymStatue - signpost 15, 4, SIGNPOST_READ, GoldenrodGymStatue + bg_event 15, 1, BGEVENT_READ, GoldenrodGymStatue + bg_event 15, 4, BGEVENT_READ, GoldenrodGymStatue -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_WHITNEY, 3, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1 - person_event SPRITE_LASS, 13, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerLassCarrie, -1 - person_event SPRITE_LASS, 6, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerLassBridget, -1 - person_event SPRITE_BUENA, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBeautyVictoria, -1 - person_event SPRITE_BUENA, 5, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBeautySamantha, -1 - person_event SPRITE_GYM_GUY, 15, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1 + object_event SPRITE_WHITNEY, 3, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1 + object_event SPRITE_LASS, 13, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1 + object_event SPRITE_LASS, 6, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1 + object_event SPRITE_BUENA, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1 + object_event SPRITE_BUENA, 5, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautySamantha, -1 + object_event SPRITE_GYM_GUY, 15, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 7455a1eb1..bc7229ca2 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -4,7 +4,7 @@ const_value set 2 const GOLDENRODHAPPINESSRATER_TWIN GoldenrodHappinessRater_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -145,17 +145,17 @@ GoldenrodHappinessRater_MapEventHeader: warp_def $7, $2, 3, GOLDENROD_CITY warp_def $7, $3, 3, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 1, 0, SIGNPOST_READ, HappinessRatersHouseBookshelf - signpost 1, 1, SIGNPOST_READ, HappinessRatersHouseBookshelf - signpost 1, 7, SIGNPOST_READ, HappinessRatersHouseRadio + bg_event 1, 0, BGEVENT_READ, HappinessRatersHouseBookshelf + bg_event 1, 1, BGEVENT_READ, HappinessRatersHouseBookshelf + bg_event 1, 7, BGEVENT_READ, HappinessRatersHouseRadio -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x54953, -1 - person_event SPRITE_POKEFAN_M, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1 - person_event SPRITE_TWIN, 6, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1 + object_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x54953, -1 + object_event SPRITE_POKEFAN_M, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1 + object_event SPRITE_TWIN, 6, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index a00b47e11..83984a694 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -3,14 +3,14 @@ const_value set 2 const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN GoldenrodMagnetTrainStation_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - maptrigger .DummyTrigger + scene_script .DummyScene .MapCallbacks: db 0 -.DummyTrigger: +.DummyScene: end OfficerScript_0x550ec: @@ -175,14 +175,14 @@ GoldenrodMagnetTrainStation_MapEventHeader: warp_def $5, $6, 4, SAFFRON_TRAIN_STATION warp_def $5, $b, 3, SAFFRON_TRAIN_STATION -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $6, $b, Script_ArriveFromSaffron + coord_event 0, $6, $b, Script_ArriveFromSaffron -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_OFFICER, 9, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1 - person_event SPRITE_GENTLEMAN, 14, 11, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationGentlemanScript, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN + object_event SPRITE_OFFICER, 9, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1 + object_event SPRITE_GENTLEMAN, 14, 11, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationGentlemanScript, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index c785510ed..3b0ef46a2 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -2,7 +2,7 @@ const_value set 2 const GOLDENRODNAMERATER_NAME_RATER GoldenrodNameRater_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -33,15 +33,15 @@ GoldenrodNameRater_MapEventHeader: warp_def $7, $2, 8, GOLDENROD_CITY warp_def $7, $3, 8, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 1, 0, SIGNPOST_READ, GoldenrodNameRaterBookshelf - signpost 1, 1, SIGNPOST_READ, GoldenrodNameRaterBookshelf - signpost 1, 7, SIGNPOST_READ, GoldenrodNameRaterRadio + bg_event 1, 0, BGEVENT_READ, GoldenrodNameRaterBookshelf + bg_event 1, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf + bg_event 1, 7, BGEVENT_READ, GoldenrodNameRaterRadio -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodNameRater, -1 + object_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodNameRater, -1 diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 3eb250ff1..2d303adbe 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const GOLDENRODPPSPEECHHOUSE_LASS GoldenrodPPSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -60,16 +60,16 @@ GoldenrodPPSpeechHouse_MapEventHeader: warp_def $7, $2, 7, GOLDENROD_CITY warp_def $7, $3, 7, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 1, 0, SIGNPOST_READ, GoldenrodPPSpeechHouseBookshelf1 - signpost 1, 1, SIGNPOST_READ, GoldenrodPPSpeechHouseBookshelf2 - signpost 1, 7, SIGNPOST_READ, GoldenrodPPSpeechHouseRadio + bg_event 1, 0, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf1 + bg_event 1, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf2 + bg_event 1, 7, BGEVENT_READ, GoldenrodPPSpeechHouseRadio -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1 - person_event SPRITE_LASS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1 + object_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1 + object_event SPRITE_LASS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1 diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index ec4bb3f28..535ee02f8 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -4,7 +4,7 @@ const_value set 2 const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST3 GoldenrodPokeComCenter2FMobile_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -277,17 +277,17 @@ GoldenrodPokeComCenter2FMobile_MapEventHeader: warp_def $1f, $0, 3, GOLDENROD_POKECENTER_1F warp_def $1f, $1, 3, GOLDENROD_POKECENTER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 26, 6, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost0Script - signpost 28, 6, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost1Script - signpost 26, 3, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost2Script + bg_event 26, 6, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost0Script + bg_event 28, 6, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost1Script + bg_event 26, 3, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost2Script -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_SCIENTIST, 28, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist1Script, -1 - person_event SPRITE_SCIENTIST, 27, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist2Script, -1 - person_event SPRITE_SCIENTIST, 29, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist3Script, -1 + object_event SPRITE_SCIENTIST, 28, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist1Script, -1 + object_event SPRITE_SCIENTIST, 27, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist2Script, -1 + object_event SPRITE_SCIENTIST, 29, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist3Script, -1 diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index e39832ab2..d44c1b01e 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -6,7 +6,7 @@ const_value set 2 const GOLDENRODPOKECENTER1F_POKEFAN_F GoldenrodPokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -15,7 +15,7 @@ GoldenrodPokecenter1F_MapScriptHeader: NurseScript_0x60f91: jumpstd pokecenternurse -GoldenrodPokecenter1F_GSBallTriggerLeft: +GoldenrodPokecenter1F_GSBallSceneLeft: writebyte BATTLETOWERACTION_CHECKMOBILEEVENT special BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball @@ -25,7 +25,7 @@ GoldenrodPokecenter1F_GSBallTriggerLeft: checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER iftrue .cancel playsound SFX_EXIT_BUILDING - moveperson GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, $0, $7 + moveobject GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, $0, $7 disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playmusic MUSIC_SHOW_ME_AROUND @@ -47,7 +47,7 @@ GoldenrodPokecenter1F_GSBallTriggerLeft: .cancel end -GoldenrodPokecenter1F_GSBallTriggerRight: +GoldenrodPokecenter1F_GSBallSceneRight: writebyte BATTLETOWERACTION_CHECKMOBILEEVENT special BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball @@ -57,7 +57,7 @@ GoldenrodPokecenter1F_GSBallTriggerRight: checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER iftrue .cancel playsound SFX_EXIT_BUILDING - moveperson GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, $0, $7 + moveobject GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, $0, $7 disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playmusic MUSIC_SHOW_ME_AROUND @@ -815,18 +815,18 @@ GoldenrodPokecenter1F_MapEventHeader: warp_def $6, $0, 1, GOLDENROD_POKECOM_CENTER_2F_MOBILE warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $7, $3, GoldenrodPokecenter1F_GSBallTriggerLeft - xy_trigger 0, $7, $4, GoldenrodPokecenter1F_GSBallTriggerRight + coord_event 0, $7, $3, GoldenrodPokecenter1F_GSBallSceneLeft + coord_event 0, $7, $4, GoldenrodPokecenter1F_GSBallSceneRight -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x60f91, -1 - person_event SPRITE_LINK_RECEPTIONIST, 8, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 - person_event SPRITE_GAMEBOY_KID, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1 - person_event SPRITE_LASS, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodPokecenter1FLassScript, -1 - person_event SPRITE_POKEFAN_F, 5, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x61024, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x60f91, -1 + object_event SPRITE_LINK_RECEPTIONIST, 8, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event SPRITE_GAMEBOY_KID, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1 + object_event SPRITE_LASS, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FLassScript, -1 + object_event SPRITE_POKEFAN_F, 5, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x61024, -1 diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index 1b6befa08..c8d6ed1c4 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const GUIDEGENTSHOUSE_GRAMPS GuideGentsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -36,14 +36,14 @@ GuideGentsHouse_MapEventHeader: warp_def $7, $2, 4, CHERRYGROVE_CITY warp_def $7, $3, 4, CHERRYGROVE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, GuideGentsHouseBookshelf - signpost 1, 1, SIGNPOST_READ, GuideGentsHouseBookshelf + bg_event 1, 0, BGEVENT_READ, GuideGentsHouseBookshelf + bg_event 1, 1, BGEVENT_READ, GuideGentsHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE + object_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 2f4a3a200..e795feea8 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -2,10 +2,10 @@ const_value set 2 const HALLOFFAME_LANCE HallOfFame_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .EnterHallOfFame - maptrigger .DummyTrigger + scene_script .EnterHallOfFame + scene_script .DummyScene .MapCallbacks: db 0 @@ -14,7 +14,7 @@ HallOfFame_MapScriptHeader: priorityjump .EnterHallOfFameScript end -.DummyTrigger: +.DummyScene: end .EnterHallOfFameScript: @@ -28,7 +28,7 @@ HallOfFame_MapScriptHeader: closetext spriteface HALLOFFAME_LANCE, UP applymovement PLAYER, HallOfFame_SlowlyApproachMachine - dotrigger $1 + setscene $1 pause 15 writebyte 2 ; Machine is in the Hall of Fame special HealMachineAnim @@ -38,7 +38,7 @@ HallOfFame_MapScriptHeader: clearevent EVENT_RED_IN_MT_SILVER setevent EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME clearevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME - domaptrigger SPROUT_TOWER_3F, $1 + setmapscene SPROUT_TOWER_3F, $1 special HealParty checkevent EVENT_GOT_SS_TICKET_FROM_ELM iftrue .SkipPhoneCall @@ -119,12 +119,12 @@ HallOfFame_MapEventHeader: warp_def $d, $4, 3, LANCES_ROOM warp_def $d, $5, 4, LANCES_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_LANCE, 12, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event SPRITE_LANCE, 12, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index ab2ba2702..d0341d0e1 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -4,7 +4,7 @@ const_value set 2 const ICEPATH1F_POKE_BALL3 IcePath1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -30,14 +30,14 @@ IcePath1F_MapEventHeader: warp_def $5, $25, 1, ICE_PATH_B1F warp_def $d, $25, 7, ICE_PATH_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_POKE_BALL, 7, 31, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL - person_event SPRITE_POKE_BALL, 23, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP - person_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN + object_event SPRITE_POKE_BALL, 7, 31, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL + object_event SPRITE_POKE_BALL, 23, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP + object_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 071133d97..3c818c766 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -6,7 +6,7 @@ const_value set 2 const ICEPATHB1F_POKE_BALL IcePathB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -94,17 +94,17 @@ IcePathB1F_MapEventHeader: warp_def $19, $5, 4, ICE_PATH_1F warp_def $1b, $b, 1, ICE_PATH_B2F_BLACKTHORN_SIDE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 30, 17, SIGNPOST_ITEM, IcePathB1FHiddenMaxPotion + bg_event 30, 17, BGEVENT_ITEM, IcePathB1FHiddenMaxPotion -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_BOULDER, 7, 11, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1 - person_event SPRITE_BOULDER, 8, 7, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2 - person_event SPRITE_BOULDER, 9, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3 - person_event SPRITE_BOULDER, 7, 17, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4 - person_event SPRITE_POKE_BALL, 35, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON + object_event SPRITE_BOULDER, 7, 11, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1 + object_event SPRITE_BOULDER, 8, 7, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2 + object_event SPRITE_BOULDER, 9, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3 + object_event SPRITE_BOULDER, 7, 17, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4 + object_event SPRITE_POKE_BALL, 35, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 135c70164..68b32a7e6 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -2,7 +2,7 @@ const_value set 2 const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL IcePathB2FBlackthornSide_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -24,13 +24,13 @@ IcePathB2FBlackthornSide_MapEventHeader: warp_def $f, $3, 8, ICE_PATH_B1F warp_def $3, $3, 2, ICE_PATH_B3F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 10, 2, SIGNPOST_ITEM, IcePathB2FBlackthornSideHiddenIceHeal + bg_event 10, 2, BGEVENT_ITEM, IcePathB2FBlackthornSideHiddenIceHeal -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST + object_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index a588441bd..60a36ac40 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -7,7 +7,7 @@ const_value set 2 const ICEPATHB2FMAHOGANYSIDE_POKE_BALL2 IcePathB2FMahoganySide_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -44,18 +44,18 @@ IcePathB2FMahoganySide_MapEventHeader: warp_def $c, $4, 5, ICE_PATH_B1F warp_def $c, $c, 6, ICE_PATH_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 17, 0, SIGNPOST_ITEM, IcePathB2FMahoganySideHiddenCarbos + bg_event 17, 0, BGEVENT_ITEM, IcePathB2FMahoganySideHiddenCarbos -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_BOULDER, 3, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1A - person_event SPRITE_BOULDER, 7, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A - person_event SPRITE_BOULDER, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A - person_event SPRITE_BOULDER, 13, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A - person_event SPRITE_POKE_BALL, 9, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL - person_event SPRITE_POKE_BALL, 2, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION + object_event SPRITE_BOULDER, 3, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1A + object_event SPRITE_BOULDER, 7, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A + object_event SPRITE_BOULDER, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A + object_event SPRITE_BOULDER, 13, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A + object_event SPRITE_POKE_BALL, 9, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL + object_event SPRITE_POKE_BALL, 2, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index 1eb0c4548..64d448956 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -3,7 +3,7 @@ const_value set 2 const ICEPATHB3F_ROCK IcePathB3F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -24,13 +24,13 @@ IcePathB3F_MapEventHeader: warp_def $5, $3, 2, ICE_PATH_B2F_MAHOGANY_SIDE warp_def $5, $f, 2, ICE_PATH_B2F_BLACKTHORN_SIDE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKE_BALL, 7, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE - person_event SPRITE_ROCK, 6, 6, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB3FRock, -1 + object_event SPRITE_POKE_BALL, 7, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE + object_event SPRITE_ROCK, 6, 6, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 5365e35d4..6ce300e27 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -12,7 +12,7 @@ const_value set 2 const ILEXFOREST_POKE_BALL4 IlexForest_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -37,52 +37,52 @@ IlexForest_MapScriptHeader: return .PositionOne: - moveperson ILEXFOREST_FARFETCHD, $e, $1f + moveobject ILEXFOREST_FARFETCHD, $e, $1f appear ILEXFOREST_FARFETCHD return .PositionTwo: - moveperson ILEXFOREST_FARFETCHD, $f, $19 + moveobject ILEXFOREST_FARFETCHD, $f, $19 appear ILEXFOREST_FARFETCHD return .PositionThree: - moveperson ILEXFOREST_FARFETCHD, $14, $18 + moveobject ILEXFOREST_FARFETCHD, $14, $18 appear ILEXFOREST_FARFETCHD return .PositionFour: - moveperson ILEXFOREST_FARFETCHD, $1d, $16 + moveobject ILEXFOREST_FARFETCHD, $1d, $16 appear ILEXFOREST_FARFETCHD return .PositionFive: - moveperson ILEXFOREST_FARFETCHD, $1c, $1f + moveobject ILEXFOREST_FARFETCHD, $1c, $1f appear ILEXFOREST_FARFETCHD return .PositionSix: - moveperson ILEXFOREST_FARFETCHD, $18, $23 + moveobject ILEXFOREST_FARFETCHD, $18, $23 appear ILEXFOREST_FARFETCHD return .PositionSeven: - moveperson ILEXFOREST_FARFETCHD, $16, $1f + moveobject ILEXFOREST_FARFETCHD, $16, $1f appear ILEXFOREST_FARFETCHD return .PositionEight: - moveperson ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, $f, $1d appear ILEXFOREST_FARFETCHD return .PositionNine: - moveperson ILEXFOREST_FARFETCHD, $a, $23 + moveobject ILEXFOREST_FARFETCHD, $a, $23 appear ILEXFOREST_FARFETCHD return .PositionTen: - moveperson ILEXFOREST_FARFETCHD, $6, $1c + moveobject ILEXFOREST_FARFETCHD, $6, $1c appear ILEXFOREST_FARFETCHD return @@ -125,7 +125,7 @@ IlexForestFarfetchdScript: waitbutton closetext applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos1_Pos2 - moveperson ILEXFOREST_FARFETCHD, $f, $19 + moveobject ILEXFOREST_FARFETCHD, $f, $19 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 2 @@ -135,7 +135,7 @@ IlexForestFarfetchdScript: scall .CryAndCheckFacing if_equal DOWN, .Position2_Down applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos2_Pos3 - moveperson ILEXFOREST_FARFETCHD, $14, $18 + moveobject ILEXFOREST_FARFETCHD, $14, $18 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 3 @@ -143,7 +143,7 @@ IlexForestFarfetchdScript: .Position2_Down: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos2_Pos8 - moveperson ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, $f, $1d disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 @@ -153,7 +153,7 @@ IlexForestFarfetchdScript: scall .CryAndCheckFacing if_equal LEFT, .Position3_Left applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos3_Pos4 - moveperson ILEXFOREST_FARFETCHD, $1d, $16 + moveobject ILEXFOREST_FARFETCHD, $1d, $16 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 4 @@ -161,7 +161,7 @@ IlexForestFarfetchdScript: .Position3_Left: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos3_Pos2 - moveperson ILEXFOREST_FARFETCHD, $f, $19 + moveobject ILEXFOREST_FARFETCHD, $f, $19 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 2 @@ -171,7 +171,7 @@ IlexForestFarfetchdScript: scall .CryAndCheckFacing if_equal UP, .Position4_Up applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos4_Pos5 - moveperson ILEXFOREST_FARFETCHD, $1c, $1f + moveobject ILEXFOREST_FARFETCHD, $1c, $1f disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 5 @@ -179,7 +179,7 @@ IlexForestFarfetchdScript: .Position4_Up: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos4_Pos3 - moveperson ILEXFOREST_FARFETCHD, $14, $18 + moveobject ILEXFOREST_FARFETCHD, $14, $18 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 3 @@ -191,7 +191,7 @@ IlexForestFarfetchdScript: if_equal LEFT, .Position5_Left if_equal RIGHT, .Position5_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos5_Pos6 - moveperson ILEXFOREST_FARFETCHD, $18, $23 + moveobject ILEXFOREST_FARFETCHD, $18, $23 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 6 @@ -199,7 +199,7 @@ IlexForestFarfetchdScript: .Position5_Left: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos5_Pos7 - moveperson ILEXFOREST_FARFETCHD, $16, $1f + moveobject ILEXFOREST_FARFETCHD, $16, $1f disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 7 @@ -207,7 +207,7 @@ IlexForestFarfetchdScript: .Position5_Up: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos5_Pos4_Up - moveperson ILEXFOREST_FARFETCHD, $1d, $16 + moveobject ILEXFOREST_FARFETCHD, $1d, $16 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 4 @@ -215,7 +215,7 @@ IlexForestFarfetchdScript: .Position5_Right: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos5_Pos4_Right - moveperson ILEXFOREST_FARFETCHD, $1d, $16 + moveobject ILEXFOREST_FARFETCHD, $1d, $16 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 4 @@ -225,7 +225,7 @@ IlexForestFarfetchdScript: scall .CryAndCheckFacing if_equal RIGHT, .Position6_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos6_Pos7 - moveperson ILEXFOREST_FARFETCHD, $16, $1f + moveobject ILEXFOREST_FARFETCHD, $16, $1f disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 7 @@ -233,7 +233,7 @@ IlexForestFarfetchdScript: .Position6_Right: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos6_Pos5 - moveperson ILEXFOREST_FARFETCHD, $1c, $1f + moveobject ILEXFOREST_FARFETCHD, $1c, $1f disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 5 @@ -244,7 +244,7 @@ IlexForestFarfetchdScript: if_equal DOWN, .Position7_Down if_equal LEFT, .Position7_Left applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos7_Pos8 - moveperson ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, $f, $1d disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 @@ -252,7 +252,7 @@ IlexForestFarfetchdScript: .Position7_Left: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos7_Pos6 - moveperson ILEXFOREST_FARFETCHD, $18, $23 + moveobject ILEXFOREST_FARFETCHD, $18, $23 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 6 @@ -260,7 +260,7 @@ IlexForestFarfetchdScript: .Position7_Down: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos7_Pos5 - moveperson ILEXFOREST_FARFETCHD, $1c, $1f + moveobject ILEXFOREST_FARFETCHD, $1c, $1f disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 5 @@ -272,7 +272,7 @@ IlexForestFarfetchdScript: if_equal LEFT, .Position8_Left if_equal RIGHT, .Position8_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos8_Pos9 - moveperson ILEXFOREST_FARFETCHD, $a, $23 + moveobject ILEXFOREST_FARFETCHD, $a, $23 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 9 @@ -280,7 +280,7 @@ IlexForestFarfetchdScript: .Position8_Right: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos8_Pos7 - moveperson ILEXFOREST_FARFETCHD, $16, $1f + moveobject ILEXFOREST_FARFETCHD, $16, $1f disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 7 @@ -289,7 +289,7 @@ IlexForestFarfetchdScript: .Position8_Up: .Position8_Left: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos8_Pos2 - moveperson ILEXFOREST_FARFETCHD, $f, $19 + moveobject ILEXFOREST_FARFETCHD, $f, $19 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 2 @@ -300,7 +300,7 @@ IlexForestFarfetchdScript: if_equal DOWN, .Position9_Down if_equal RIGHT, .Position9_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos9_Pos10 - moveperson ILEXFOREST_FARFETCHD, $6, $1c + moveobject ILEXFOREST_FARFETCHD, $6, $1c disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 10 @@ -311,7 +311,7 @@ IlexForestFarfetchdScript: .Position9_Right: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos9_Pos8_Right - moveperson ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, $f, $1d disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 @@ -319,7 +319,7 @@ IlexForestFarfetchdScript: .Position9_Down: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos9_Pos8_Down - moveperson ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, $f, $1d disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 @@ -949,27 +949,27 @@ IlexForest_MapEventHeader: warp_def $2a, $3, 1, ILEX_FOREST_AZALEA_GATE warp_def $2b, $3, 2, ILEX_FOREST_AZALEA_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 5 - signpost 17, 3, SIGNPOST_READ, MapIlexForestSignpost0Script - signpost 7, 11, SIGNPOST_ITEM, IlexForestHiddenEther - signpost 14, 22, SIGNPOST_ITEM, IlexForestHiddenSuperPotion - signpost 17, 1, SIGNPOST_ITEM, IlexForestHiddenFullHeal - signpost 22, 8, SIGNPOST_UP, MapIlexForestSignpost4Script + bg_event 17, 3, BGEVENT_READ, MapIlexForestSignpost0Script + bg_event 7, 11, BGEVENT_ITEM, IlexForestHiddenEther + bg_event 14, 22, BGEVENT_ITEM, IlexForestHiddenSuperPotion + bg_event 17, 1, BGEVENT_ITEM, IlexForestHiddenFullHeal + bg_event 22, 8, BGEVENT_UP, MapIlexForestSignpost4Script -.PersonEvents: +.ObjectEvents: db 11 - person_event SPRITE_BIRD, 31, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, IlexForestFarfetchdScript, EVENT_ILEX_FOREST_FARFETCHD - person_event SPRITE_YOUNGSTER, 28, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE - person_event SPRITE_BLACK_BELT, 28, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER - person_event SPRITE_ROCKER, 14, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IlexForestHeadbuttGuyScript, -1 - person_event SPRITE_POKE_BALL, 32, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestRevive, EVENT_ILEX_FOREST_REVIVE - person_event SPRITE_KURT, 29, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT - person_event SPRITE_LASS, 24, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS - person_event SPRITE_YOUNGSTER, 1, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 0, TrainerBug_catcherWayne, -1 - person_event SPRITE_POKE_BALL, 17, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK - person_event SPRITE_POKE_BALL, 7, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE - person_event SPRITE_POKE_BALL, 1, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER + object_event SPRITE_BIRD, 31, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestFarfetchdScript, EVENT_ILEX_FOREST_FARFETCHD + object_event SPRITE_YOUNGSTER, 28, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE + object_event SPRITE_BLACK_BELT, 28, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER + object_event SPRITE_ROCKER, 14, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestHeadbuttGuyScript, -1 + object_event SPRITE_POKE_BALL, 32, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestRevive, EVENT_ILEX_FOREST_REVIVE + object_event SPRITE_KURT, 29, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT + object_event SPRITE_LASS, 24, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS + object_event SPRITE_YOUNGSTER, 1, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerBug_catcherWayne, -1 + object_event SPRITE_POKE_BALL, 17, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK + object_event SPRITE_POKE_BALL, 7, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE + object_event SPRITE_POKE_BALL, 1, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index b8d5b5481..76a2925de 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -3,7 +3,7 @@ const_value set 2 const ILEXFORESTAZALEAGATE_GRANNY IlexForestAzaleaGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -41,13 +41,13 @@ IlexForestAzaleaGate_MapEventHeader: warp_def $4, $9, 7, AZALEA_TOWN warp_def $5, $9, 8, AZALEA_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1 - person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1 + object_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1 diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 5e3850a80..dc657df20 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -7,24 +7,24 @@ const_value set 2 const INDIGOPLATEAUPOKECENTER1F_ABRA IndigoPlateauPokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - maptrigger .DummyTrigger + scene_script .DummyScene .MapCallbacks: db 1 dbw MAPCALLBACK_NEWMAP, .PrepareElite4 -.DummyTrigger: +.DummyScene: end .PrepareElite4: - domaptrigger WILLS_ROOM, $0 - domaptrigger KOGAS_ROOM, $0 - domaptrigger BRUNOS_ROOM, $0 - domaptrigger KARENS_ROOM, $0 - domaptrigger LANCES_ROOM, $0 - domaptrigger HALL_OF_FAME, $0 + setmapscene WILLS_ROOM, $0 + setmapscene KOGAS_ROOM, $0 + setmapscene BRUNOS_ROOM, $0 + setmapscene KARENS_ROOM, $0 + setmapscene LANCES_ROOM, $0 + setmapscene HALL_OF_FAME, $0 clearevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED clearevent EVENT_WILLS_ROOM_EXIT_OPEN clearevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED @@ -54,7 +54,7 @@ PlateauRivalBattle1: if_equal THURSDAY, PlateauRivalScriptDone if_equal FRIDAY, PlateauRivalScriptDone if_equal SATURDAY, PlateauRivalScriptDone - moveperson INDIGOPLATEAUPOKECENTER1F_SILVER, $11, $9 + moveobject INDIGOPLATEAUPOKECENTER1F_SILVER, $11, $9 appear INDIGOPLATEAUPOKECENTER1F_SILVER spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 @@ -130,7 +130,7 @@ PlateauRivalPostBattle: spriteface PLAYER, DOWN applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalLeavesMovement disappear INDIGOPLATEAUPOKECENTER1F_SILVER - dotrigger $0 + setscene $0 playmapmusic setflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT PlateauRivalScriptDone: @@ -313,19 +313,19 @@ IndigoPlateauPokecenter1F_MapEventHeader: warp_def $d, $0, 1, POKECENTER_2F warp_def $3, $e, 1, WILLS_ROOM -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $4, $10, PlateauRivalBattle1 - xy_trigger 0, $4, $11, PlateauRivalBattle2 + coord_event 0, $4, $10, PlateauRivalBattle1 + coord_event 0, $4, $11, PlateauRivalBattle2 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_NURSE, 7, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x18012c, -1 - person_event SPRITE_CLERK, 7, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1 - person_event SPRITE_COOLTRAINER_M, 11, 11, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FCooltrainerMScript, -1 - person_event SPRITE_SILVER, 9, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL - person_event SPRITE_GRAMPS, 9, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY - person_event SPRITE_JYNX, 9, 0, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, AbraScript, EVENT_TELEPORT_GUY + object_event SPRITE_NURSE, 7, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18012c, -1 + object_event SPRITE_CLERK, 7, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1 + object_event SPRITE_COOLTRAINER_M, 11, 11, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FCooltrainerMScript, -1 + object_event SPRITE_SILVER, 9, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL + object_event SPRITE_GRAMPS, 9, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY + object_event SPRITE_JYNX, 9, 0, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, AbraScript, EVENT_TELEPORT_GUY diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index dce334d9c..a24500d24 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -2,10 +2,10 @@ const_value set 2 const KARENSROOM_KAREN KarensRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .LockDoor - maptrigger .DummyTrigger + scene_script .LockDoor + scene_script .DummyScene .MapCallbacks: db 1 @@ -15,7 +15,7 @@ KarensRoom_MapScriptHeader: priorityjump .KarensDoorLocksBehindYou end -.DummyTrigger: +.DummyScene: end .KarensRoomDoors: @@ -37,7 +37,7 @@ KarensRoom_MapScriptHeader: changeblock $4, $e, $2a reloadmappart closetext - dotrigger $1 + setscene $1 setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -143,12 +143,12 @@ KarensRoom_MapEventHeader: warp_def $2, $4, 1, LANCES_ROOM warp_def $2, $5, 2, LANCES_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_KAREN, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, KarenScript_Battle, -1 + object_event SPRITE_KAREN, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KarenScript_Battle, -1 diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 9d6eeb937..15d7185ab 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -2,10 +2,10 @@ const_value set 2 const KOGASROOM_KOGA KogasRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .LockDoor - maptrigger .DummyTrigger + scene_script .LockDoor + scene_script .DummyScene .MapCallbacks: db 1 @@ -15,7 +15,7 @@ KogasRoom_MapScriptHeader: priorityjump .KogasDoorLocksBehindYou end -.DummyTrigger: +.DummyScene: end .KogasRoomDoors: @@ -37,7 +37,7 @@ KogasRoom_MapScriptHeader: changeblock $4, $e, $2a reloadmappart closetext - dotrigger $1 + setscene $1 setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -140,12 +140,12 @@ KogasRoom_MapEventHeader: warp_def $2, $4, 1, BRUNOS_ROOM warp_def $2, $5, 2, BRUNOS_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_KOGA, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, KogaScript_Battle, -1 + object_event SPRITE_KOGA, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, KogaScript_Battle, -1 diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 3be6aaffa..20d5d0b7e 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -6,18 +6,18 @@ const_value set 2 const KRISSHOUSE1F_POKEFAN_F KrissHouse1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end UnknownScript_0x7a4d8: @@ -43,7 +43,7 @@ UnknownScript_0x7a4f6: setflag ENGINE_POKEGEAR setflag ENGINE_PHONE_CARD addcellnum PHONE_MOM - dotrigger $1 + setscene $1 setevent EVENT_KRISS_HOUSE_MOM_1 clearevent EVENT_KRISS_HOUSE_MOM_2 writetext UnknownText_0x7a6bd @@ -115,7 +115,7 @@ UnknownScript_0x7a57e: MomScript_0x7a582: faceplayer setevent EVENT_RECEIVED_BALLS_FROM_KURT - checktriggers + checkscene iffalse UnknownScript_0x7a572 opentext checkevent EVENT_FIRST_TIME_BANKING_WITH_MOM @@ -395,22 +395,22 @@ KrissHouse1F_MapEventHeader: warp_def $7, $7, 2, NEW_BARK_TOWN warp_def $0, $9, 1, KRISS_HOUSE_2F -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $4, $8, UnknownScript_0x7a4d8 - xy_trigger 0, $4, $9, UnknownScript_0x7a4db + coord_event 0, $4, $8, UnknownScript_0x7a4d8 + coord_event 0, $4, $9, UnknownScript_0x7a4db -.Signposts: +.BGEvents: db 4 - signpost 1, 0, SIGNPOST_READ, StoveScript - signpost 1, 1, SIGNPOST_READ, SinkScript - signpost 1, 2, SIGNPOST_READ, FridgeScript - signpost 1, 4, SIGNPOST_READ, TVScript + bg_event 1, 0, BGEVENT_READ, StoveScript + bg_event 1, 1, BGEVENT_READ, SinkScript + bg_event 1, 2, BGEVENT_READ, FridgeScript + bg_event 1, 4, BGEVENT_READ, TVScript -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1 - person_event SPRITE_MOM, 2, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - person_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - person_event SPRITE_MOM, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - person_event SPRITE_POKEFAN_F, 4, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR + object_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1 + object_event SPRITE_MOM, 2, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + object_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + object_event SPRITE_MOM, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + object_event SPRITE_POKEFAN_F, 4, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index eec62a6aa..528dc505f 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -5,7 +5,7 @@ const_value set 2 const KRISSHOUSE2F_BIG_DOLL KrissHouse2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -124,19 +124,19 @@ KrissHouse2F_MapEventHeader: db 1 warp_def $0, $7, 3, KRISS_HOUSE_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 1, 2, SIGNPOST_UP, KrissHousePC - signpost 1, 3, SIGNPOST_READ, KrissHouseRadio - signpost 1, 5, SIGNPOST_READ, KrissHouseBookshelf - signpost 0, 6, SIGNPOST_IFSET, KrissHousePoster + bg_event 1, 2, BGEVENT_UP, KrissHousePC + bg_event 1, 3, BGEVENT_READ, KrissHouseRadio + bg_event 1, 5, BGEVENT_READ, KrissHouseBookshelf + bg_event 0, 6, BGEVENT_IFSET, KrissHousePoster -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_CONSOLE, 2, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE - person_event SPRITE_DOLL_1, 4, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1 - person_event SPRITE_DOLL_2, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2 - person_event SPRITE_BIG_DOLL, 1, 0, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL + object_event SPRITE_CONSOLE, 2, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE + object_event SPRITE_DOLL_1, 4, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1 + object_event SPRITE_DOLL_2, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2 + object_event SPRITE_BIG_DOLL, 1, 0, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 215a9fdf2..44dbd8449 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const KRISSNEIGHBORSHOUSE_POKEFAN_F KrissNeighborsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -107,16 +107,16 @@ KrissNeighborsHouse_MapEventHeader: warp_def $7, $2, 3, NEW_BARK_TOWN warp_def $7, $3, 3, NEW_BARK_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 1, 0, SIGNPOST_READ, KrissNeighborsHouseBookshelf - signpost 1, 1, SIGNPOST_READ, KrissNeighborsHouseBookshelf - signpost 1, 7, SIGNPOST_READ, KrissNeighborsHouseRadio + bg_event 1, 0, BGEVENT_READ, KrissNeighborsHouseBookshelf + bg_event 1, 1, BGEVENT_READ, KrissNeighborsHouseBookshelf + bg_event 1, 7, BGEVENT_READ, KrissNeighborsHouseRadio -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, KrissNeighborsDaughter, -1 - person_event SPRITE_POKEFAN_F, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR + object_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighborsDaughter, -1 + object_event SPRITE_POKEFAN_F, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index e5c76fec3..ffbc78ea1 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -6,7 +6,7 @@ const_value set 2 const KURTSHOUSE_TWIN2 KurtsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -311,7 +311,7 @@ KurtScript_0x18e178: clearevent EVENT_AZALEA_TOWN_KURT waitsfx special RestartMapMusic - domaptrigger AZALEA_TOWN, $2 + setmapscene AZALEA_TOWN, $2 end KurtScript_0x18e3bd: @@ -685,23 +685,23 @@ KurtsHouse_MapEventHeader: warp_def $7, $3, 4, AZALEA_TOWN warp_def $7, $4, 4, AZALEA_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 7 - signpost 1, 6, SIGNPOST_READ, KurtsHouseRadio - signpost 0, 8, SIGNPOST_READ, KurtsHouseOakPhoto - signpost 0, 9, SIGNPOST_READ, KurtsHouseOakPhoto - signpost 1, 5, SIGNPOST_READ, KurtsHouseBookshelf - signpost 1, 2, SIGNPOST_READ, KurtsHouseBookshelf - signpost 1, 3, SIGNPOST_READ, KurtsHouseBookshelf - signpost 1, 4, SIGNPOST_READ, KurtsHouseCelebiStatue + bg_event 1, 6, BGEVENT_READ, KurtsHouseRadio + bg_event 0, 8, BGEVENT_READ, KurtsHouseOakPhoto + bg_event 0, 9, BGEVENT_READ, KurtsHouseOakPhoto + bg_event 1, 5, BGEVENT_READ, KurtsHouseBookshelf + bg_event 1, 2, BGEVENT_READ, KurtsHouseBookshelf + bg_event 1, 3, BGEVENT_READ, KurtsHouseBookshelf + bg_event 1, 4, BGEVENT_READ, KurtsHouseCelebiStatue -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_KURT, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1 - person_event SPRITE_TWIN, 3, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1 - person_event SPRITE_SLOWPOKE, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE - person_event SPRITE_KURT, 3, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2 - person_event SPRITE_TWIN, 4, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2 + object_event SPRITE_KURT, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1 + object_event SPRITE_TWIN, 3, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1 + object_event SPRITE_SLOWPOKE, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE + object_event SPRITE_KURT, 3, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2 + object_event SPRITE_TWIN, 4, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2 diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 426caacd4..80200cebc 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -13,20 +13,20 @@ const_value set 2 const LAKEOFRAGE_POKE_BALL2 LakeOfRage_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 2 dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_OBJECTS, .Wesley -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end .FlyPoint: @@ -62,7 +62,7 @@ UnknownScript_0x70035: disappear LAKEOFRAGE_LANCE clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE setevent EVENT_DECIDED_TO_HELP_LANCE - domaptrigger MAHOGANY_MART_1F, $1 + setmapscene MAHOGANY_MART_1F, $1 end UnknownScript_0x7004e: @@ -101,7 +101,7 @@ UnknownScript_0x7007a: waitsfx itemnotify closetext - dotrigger $0 + setscene $0 appear LAKEOFRAGE_LANCE end @@ -505,28 +505,28 @@ LakeOfRage_MapEventHeader: warp_def $3, $7, 1, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE warp_def $1f, $1b, 1, LAKE_OF_RAGE_MAGIKARP_HOUSE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 5 - signpost 27, 21, SIGNPOST_READ, MapLakeOfRageSignpost0Script - signpost 31, 25, SIGNPOST_READ, MapLakeOfRageSignpost1Script - signpost 28, 11, SIGNPOST_ITEM, LakeOfRageHiddenFullRestore - signpost 4, 4, SIGNPOST_ITEM, LakeOfRageHiddenRareCandy - signpost 5, 35, SIGNPOST_ITEM, LakeOfRageHiddenMaxPotion + bg_event 27, 21, BGEVENT_READ, MapLakeOfRageSignpost0Script + bg_event 31, 25, BGEVENT_READ, MapLakeOfRageSignpost1Script + bg_event 28, 11, BGEVENT_ITEM, LakeOfRageHiddenFullRestore + bg_event 4, 4, BGEVENT_ITEM, LakeOfRageHiddenRareCandy + bg_event 5, 35, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion -.PersonEvents: +.ObjectEvents: db 12 - person_event SPRITE_LANCE, 28, 21, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE - person_event SPRITE_GRAMPS, 26, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x7008e, -1 - person_event SPRITE_SUPER_NERD, 13, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LakeOfRageSuperNerdScript, -1 - person_event SPRITE_COOLTRAINER_F, 29, 25, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LakeOfRageCooltrainerFScript, -1 - person_event SPRITE_FISHER, 23, 30, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS - person_event SPRITE_FISHER, 26, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS - person_event SPRITE_COOLTRAINER_M, 15, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS - person_event SPRITE_COOLTRAINER_F, 7, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS - person_event SPRITE_GYARADOS, 22, 18, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS - person_event SPRITE_SUPER_NERD, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY - person_event SPRITE_POKE_BALL, 10, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER - person_event SPRITE_POKE_BALL, 2, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT + object_event SPRITE_LANCE, 28, 21, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE + object_event SPRITE_GRAMPS, 26, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7008e, -1 + object_event SPRITE_SUPER_NERD, 13, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageSuperNerdScript, -1 + object_event SPRITE_COOLTRAINER_F, 29, 25, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageCooltrainerFScript, -1 + object_event SPRITE_FISHER, 23, 30, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS + object_event SPRITE_FISHER, 26, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS + object_event SPRITE_COOLTRAINER_M, 15, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS + object_event SPRITE_COOLTRAINER_F, 7, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS + object_event SPRITE_GYARADOS, 22, 18, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS + object_event SPRITE_SUPER_NERD, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY + object_event SPRITE_POKE_BALL, 10, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER + object_event SPRITE_POKE_BALL, 2, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm index 0e8825e72..e5a88623d 100644 --- a/maps/LakeOfRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER LakeOfRageHiddenPowerHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -76,14 +76,14 @@ LakeOfRageHiddenPowerHouse_MapEventHeader: warp_def $7, $2, 1, LAKE_OF_RAGE warp_def $7, $3, 1, LAKE_OF_RAGE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, HiddenPowerHouseBookshelf - signpost 1, 1, SIGNPOST_READ, HiddenPowerHouseBookshelf + bg_event 1, 0, BGEVENT_READ, HiddenPowerHouseBookshelf + bg_event 1, 1, BGEVENT_READ, HiddenPowerHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, HiddenPowerGuy, -1 + object_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, HiddenPowerGuy, -1 diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index 8c83a554a..0ac776aa1 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU LakeOfRageMagikarpHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -214,14 +214,14 @@ LakeOfRageMagikarpHouse_MapEventHeader: warp_def $7, $2, 2, LAKE_OF_RAGE warp_def $7, $3, 2, LAKE_OF_RAGE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, MagikarpHouseBookshelf - signpost 1, 1, SIGNPOST_READ, MagikarpHouseBookshelf + bg_event 1, 0, BGEVENT_READ, MagikarpHouseBookshelf + bg_event 1, 1, BGEVENT_READ, MagikarpHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x19a6ae, -1 + object_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x19a6ae, -1 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index cb32f222c..17c8628ad 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -4,10 +4,10 @@ const_value set 2 const LANCESROOM_OAK LancesRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .LockDoor - maptrigger .DummyTrigger + scene_script .LockDoor + scene_script .DummyScene .MapCallbacks: db 1 @@ -17,7 +17,7 @@ LancesRoom_MapScriptHeader: priorityjump .LancesDoorLocksBehindYou end -.DummyTrigger: +.DummyScene: end .LancesRoomDoors: @@ -39,7 +39,7 @@ LancesRoom_MapScriptHeader: changeblock $4, $16, $34 reloadmappart closetext - dotrigger $1 + setscene $1 setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED end @@ -348,16 +348,16 @@ LancesRoom_MapEventHeader: warp_def $1, $4, 1, HALL_OF_FAME warp_def $1, $5, 2, HALL_OF_FAME -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 1, $5, $4, Script_ApproachLanceFromLeft - xy_trigger 1, $5, $5, Script_ApproachLanceFromRight + coord_event 1, $5, $4, Script_ApproachLanceFromLeft + coord_event 1, $5, $5, Script_ApproachLanceFromRight -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_LANCE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1 - person_event SPRITE_TEACHER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY - person_event SPRITE_OAK, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY + object_event SPRITE_LANCE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1 + object_event SPRITE_TEACHER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY + object_event SPRITE_OAK, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 29f1cfc91..6a15dd7df 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -6,7 +6,7 @@ const_value set 2 const LAVRADIOTOWER1F_SUPER_NERD2 LavRadioTower1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -230,18 +230,18 @@ LavRadioTower1F_MapEventHeader: warp_def $7, $2, 7, LAVENDER_TOWN warp_def $7, $3, 7, LAVENDER_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 11, SIGNPOST_READ, MapLavRadioTower1FSignpost0Script - signpost 0, 5, SIGNPOST_READ, MapLavRadioTower1FSignpost1Script + bg_event 0, 11, BGEVENT_READ, MapLavRadioTower1FSignpost0Script + bg_event 0, 5, BGEVENT_READ, MapLavRadioTower1FSignpost1Script -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_RECEPTIONIST, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1 - person_event SPRITE_OFFICER, 1, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1 - person_event SPRITE_SUPER_NERD, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1 - person_event SPRITE_GENTLEMAN, 1, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1 - person_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1 + object_event SPRITE_RECEPTIONIST, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1 + object_event SPRITE_OFFICER, 1, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1 + object_event SPRITE_SUPER_NERD, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1 + object_event SPRITE_GENTLEMAN, 1, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1 + object_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index ba43dc2df..d8f88c659 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -4,7 +4,7 @@ const_value set 2 const LAVENDERMART_ROCKER LavenderMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -56,14 +56,14 @@ LavenderMart_MapEventHeader: warp_def $7, $2, 5, LAVENDER_TOWN warp_def $7, $3, 5, LAVENDER_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1 - person_event SPRITE_POKEFAN_M, 6, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1 - person_event SPRITE_ROCKER, 2, 9, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LavenderMartRockerScript, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1 + object_event SPRITE_POKEFAN_M, 6, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1 + object_event SPRITE_ROCKER, 2, 9, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1 diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 30204878b..94eb4935b 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -2,14 +2,14 @@ const_value set 2 const LAVENDERNAMERATER_NAME_RATER LavenderNameRater_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - maptrigger .DummyTrigger + scene_script .DummyScene .MapCallbacks: db 0 -.DummyTrigger: +.DummyScene: end LavenderNameRater: @@ -32,12 +32,12 @@ LavenderNameRater_MapEventHeader: warp_def $7, $2, 4, LAVENDER_TOWN warp_def $7, $3, 4, LAVENDER_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_GENTLEMAN, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LavenderNameRater, -1 + object_event SPRITE_GENTLEMAN, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderNameRater, -1 diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm index 5b740df4a..3c0f40b20 100644 --- a/maps/LavenderPokecenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const LAVENDERPOKECENTER1F_YOUNGSTER LavenderPokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -90,15 +90,15 @@ LavenderPokecenter1F_MapEventHeader: warp_def $7, $4, 1, LAVENDER_TOWN warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1 - person_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1 - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1 - person_event SPRITE_YOUNGSTER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x7e6a9, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1 + object_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1 + object_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1 + object_event SPRITE_YOUNGSTER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x7e6a9, -1 diff --git a/maps/LavenderPokecenter2FBeta.asm b/maps/LavenderPokecenter2FBeta.asm index 3958e0657..459b1e5a4 100644 --- a/maps/LavenderPokecenter2FBeta.asm +++ b/maps/LavenderPokecenter2FBeta.asm @@ -1,5 +1,5 @@ LavenderPokecenter2FBeta_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -13,11 +13,11 @@ LavenderPokecenter2FBeta_MapEventHeader: db 1 warp_def $7, $0, 3, LAVENDER_POKECENTER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 9ed0c9c5a..2e0123061 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -5,7 +5,7 @@ const_value set 2 const LAVENDERTOWN_YOUNGSTER LavenderTown_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -119,21 +119,21 @@ LavenderTown_MapEventHeader: warp_def $b, $d, 1, SOUL_HOUSE warp_def $5, $e, 1, LAV_RADIO_TOWER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 3, 11, SIGNPOST_READ, LavenderTownSign - signpost 7, 15, SIGNPOST_READ, KantoRadioStationSign - signpost 9, 3, SIGNPOST_READ, VolunteerPokemonHouseSign - signpost 13, 15, SIGNPOST_READ, SoulHouseSign - signpost 5, 6, SIGNPOST_READ, LavenderPokecenterSignText - signpost 5, 2, SIGNPOST_READ, LavenderMartSignText + bg_event 3, 11, BGEVENT_READ, LavenderTownSign + bg_event 7, 15, BGEVENT_READ, KantoRadioStationSign + bg_event 9, 3, BGEVENT_READ, VolunteerPokemonHouseSign + bg_event 13, 15, BGEVENT_READ, SoulHouseSign + bg_event 5, 6, BGEVENT_READ, LavenderPokecenterSignText + bg_event 5, 2, BGEVENT_READ, LavenderMartSignText -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_POKEFAN_M, 7, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1 - person_event SPRITE_TEACHER, 15, 2, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1 - person_event SPRITE_GRAMPS, 12, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LavenderTownGrampsScript, -1 - person_event SPRITE_YOUNGSTER, 11, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 1, LavenderTownYoungsterScript, -1 + object_event SPRITE_POKEFAN_M, 7, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1 + object_event SPRITE_TEACHER, 15, 2, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1 + object_event SPRITE_GRAMPS, 12, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderTownGrampsScript, -1 + object_event SPRITE_YOUNGSTER, 11, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 1, LavenderTownYoungsterScript, -1 diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm index d9432bcc5..d55546110 100644 --- a/maps/LavenderTownSpeechHouse.asm +++ b/maps/LavenderTownSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const LAVENDERTOWNSPEECHHOUSE_POKEFAN_F LavenderTownSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -37,14 +37,14 @@ LavenderTownSpeechHouse_MapEventHeader: warp_def $7, $2, 3, LAVENDER_TOWN warp_def $7, $3, 3, LAVENDER_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, LavenderTownSpeechHouseBookshelf - signpost 1, 1, SIGNPOST_READ, LavenderTownSpeechHouseBookshelf + bg_event 1, 0, BGEVENT_READ, LavenderTownSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, LavenderTownSpeechHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LavenderTownSpeechHousePokefanFScript, -1 + object_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownSpeechHousePokefanFScript, -1 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index acb68e46c..9bef8263a 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -8,7 +8,7 @@ const_value set 2 const MAHOGANYGYM_GYM_GUY MahoganyGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -33,7 +33,7 @@ PryceScript_0x199a9e: waitsfx setflag ENGINE_GLACIERBADGE checkcode VAR_BADGES - scall MahoganyGymTriggerRockets + scall MahoganyGymActivateRockets .FightDone: checkevent EVENT_GOT_TM16_ICY_WIND iftrue PryceScript_Defeat @@ -59,7 +59,7 @@ MahoganyGym_NoRoomForIcyWind: closetext end -MahoganyGymTriggerRockets: +MahoganyGymActivateRockets: if_equal 7, .RadioTowerRockets if_equal 6, .GoldenrodRockets end @@ -381,20 +381,20 @@ MahoganyGym_MapEventHeader: warp_def $11, $4, 3, MAHOGANY_TOWN warp_def $11, $5, 3, MAHOGANY_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 15, 3, SIGNPOST_READ, MahoganyGymStatue - signpost 15, 6, SIGNPOST_READ, MahoganyGymStatue + bg_event 15, 3, BGEVENT_READ, MahoganyGymStatue + bg_event 15, 6, BGEVENT_READ, MahoganyGymStatue -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_PRYCE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1 - person_event SPRITE_BUENA, 6, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerSkierRoxanne, -1 - person_event SPRITE_ROCKER, 17, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerBoarderRonald, -1 - person_event SPRITE_BUENA, 17, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerSkierClarissa, -1 - person_event SPRITE_ROCKER, 9, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerBoarderBrad, -1 - person_event SPRITE_ROCKER, 4, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerBoarderDouglas, -1 - person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1 + object_event SPRITE_PRYCE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1 + object_event SPRITE_BUENA, 6, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1 + object_event SPRITE_ROCKER, 17, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1 + object_event SPRITE_BUENA, 17, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierClarissa, -1 + object_event SPRITE_ROCKER, 9, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderBrad, -1 + object_event SPRITE_ROCKER, 4, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderDouglas, -1 + object_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 81823061c..5ae14cbd8 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -6,16 +6,16 @@ const_value set 2 const MAHOGANYMART1F_GRANNY MahoganyMart1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .LanceUncoversStaircase + scene_script .DummyScene0 + scene_script .LanceUncoversStaircase .MapCallbacks: db 1 dbw MAPCALLBACK_TILES, .MahoganyMart1FStaircase -.DummyTrigger0: +.DummyScene0: end .LanceUncoversStaircase: @@ -101,7 +101,7 @@ UnknownScript_0x6c38f: applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c412 playsound SFX_EXIT_BUILDING disappear MAHOGANYMART1F_LANCE - dotrigger $0 + setscene $0 waitsfx end @@ -230,16 +230,16 @@ MahoganyMart1F_MapEventHeader: warp_def $7, $4, 1, MAHOGANY_TOWN warp_def $3, $7, 1, TEAM_ROCKET_BASE_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_PHARMACIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_BLACK_BELT, 6, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_LANCE, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE - person_event SPRITE_DRAGON, 6, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE - person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS + object_event SPRITE_PHARMACIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_BLACK_BELT, 6, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_LANCE, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + object_event SPRITE_DRAGON, 6, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + object_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm index 7c98250f4..9eead5301 100644 --- a/maps/MahoganyPokecenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const MAHOGANYPOKECENTER1F_COOLTRAINER_F MahoganyPokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -63,15 +63,15 @@ MahoganyPokecenter1F_MapEventHeader: warp_def $7, $4, 4, MAHOGANY_TOWN warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x19a356, -1 - person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1 - person_event SPRITE_YOUNGSTER, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1 - person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MahoganyPokecenter1FCooltrainerFScript, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19a356, -1 + object_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1 + object_event SPRITE_YOUNGSTER, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1 + object_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FCooltrainerFScript, -1 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 0361f5195..3ced3ac77 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER MahoganyRedGyaradosSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -69,13 +69,13 @@ MahoganyRedGyaradosSpeechHouse_MapEventHeader: warp_def $7, $2, 2, MAHOGANY_TOWN warp_def $7, $3, 2, MAHOGANY_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1 - person_event SPRITE_TEACHER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x199982, -1 + object_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1 + object_event SPRITE_TEACHER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x199982, -1 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 9655b7073..93df069e8 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -5,19 +5,19 @@ const_value set 2 const MAHOGANYTOWN_LASS MahoganyTown_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 dbw MAPCALLBACK_NEWMAP, .FlyPoint -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end .FlyPoint: @@ -256,21 +256,21 @@ MahoganyTown_MapEventHeader: warp_def $d, $f, 1, MAHOGANY_POKECENTER_1F warp_def $1, $9, 3, ROUTE_43_MAHOGANY_GATE -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $8, $13, UnknownScript_0x190013 - xy_trigger 0, $9, $13, UnknownScript_0x190013 + coord_event 0, $8, $13, UnknownScript_0x190013 + coord_event 0, $9, $13, UnknownScript_0x190013 -.Signposts: +.BGEvents: db 4 - signpost 5, 1, SIGNPOST_READ, MahoganyTownSign - signpost 7, 9, SIGNPOST_READ, MahoganyTownRagecandybarSign - signpost 13, 3, SIGNPOST_READ, MahoganyGymSign - signpost 13, 16, SIGNPOST_READ, MahoganyTownPokecenterSign + bg_event 5, 1, BGEVENT_READ, MahoganyTownSign + bg_event 7, 9, BGEVENT_READ, MahoganyTownRagecandybarSign + bg_event 13, 3, BGEVENT_READ, MahoganyGymSign + bg_event 13, 16, BGEVENT_READ, MahoganyTownPokecenterSign -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_POKEFAN_M, 8, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST - person_event SPRITE_GRAMPS, 9, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1 - person_event SPRITE_FISHER, 14, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM - person_event SPRITE_LASS, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MahoganyTownLassScript, EVENT_MAHOGANY_MART_OWNERS + object_event SPRITE_POKEFAN_M, 8, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST + object_event SPRITE_GRAMPS, 9, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1 + object_event SPRITE_FISHER, 14, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM + object_event SPRITE_LASS, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownLassScript, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index f73aa3d8c..2c868e6d2 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const MANIASHOUSE_ROCKER ManiasHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -207,12 +207,12 @@ ManiasHouse_MapEventHeader: warp_def $7, $2, 1, CIANWOOD_CITY warp_def $7, $3, 1, CIANWOOD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_ROCKER, 4, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ManiaScript, -1 + object_event SPRITE_ROCKER, 4, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ManiaScript, -1 diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index aeb0cebad..4983c3fa4 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -1,8 +1,8 @@ MobileBattleRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .InitializeMobileBattleRoom - maptrigger .DummyTrigger + scene_script .InitializeMobileBattleRoom + scene_script .DummyScene .MapCallbacks: db 0 @@ -11,12 +11,12 @@ MobileBattleRoom_MapScriptHeader: priorityjump .InitializeAndPreparePokecenter2F end -.DummyTrigger: +.DummyScene: end .InitializeAndPreparePokecenter2F: - dotrigger $1 - domaptrigger POKECENTER_2F, $5 + setscene $1 + setmapscene POKECENTER_2F, $5 end MapMobileBattleRoomSignpost0Script: @@ -75,12 +75,12 @@ MobileBattleRoom_MapEventHeader: warp_def $7, $4, 6, POKECENTER_2F warp_def $7, $5, 6, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 2, 4, SIGNPOST_UP, MapMobileBattleRoomSignpost0Script + bg_event 2, 4, BGEVENT_UP, MapMobileBattleRoomSignpost0Script -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 69f762254..1ccd70ade 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -1,8 +1,8 @@ MobileTradeRoomMobile_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .InitializeMobileTradeRoomMobile - maptrigger .DummyTrigger + scene_script .InitializeMobileTradeRoomMobile + scene_script .DummyScene .MapCallbacks: db 0 @@ -11,12 +11,12 @@ MobileTradeRoomMobile_MapScriptHeader: priorityjump .InitializeAndPreparePokecenter2F end -.DummyTrigger: +.DummyScene: end .InitializeAndPreparePokecenter2F: - dotrigger $1 - domaptrigger POKECENTER_2F, $4 + setscene $1 + setmapscene POKECENTER_2F, $4 end MapMobileTradeRoomMobileSignpost0Script: @@ -43,12 +43,12 @@ MobileTradeRoomMobile_MapEventHeader: warp_def $7, $4, 5, POKECENTER_2F warp_def $7, $5, 5, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 2, 4, SIGNPOST_UP, MapMobileTradeRoomMobileSignpost0Script + bg_event 2, 4, BGEVENT_UP, MapMobileTradeRoomMobileSignpost0Script -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 2d30c2ab5..1f7301ebb 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -2,10 +2,10 @@ const_value set 2 const MOUNTMOON_SILVER MountMoon_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .RivalEncounter - maptrigger .DummyTrigger + scene_script .RivalEncounter + scene_script .DummyScene .MapCallbacks: db 0 @@ -14,7 +14,7 @@ MountMoon_MapScriptHeader: priorityjump .RivalBattle end -.DummyTrigger: +.DummyScene: end .RivalBattle: @@ -66,7 +66,7 @@ MountMoon_MapScriptHeader: closetext applymovement MOUNTMOON_SILVER, MountMoonSilverMovementAfter disappear MOUNTMOON_SILVER - dotrigger $1 + setscene $1 setevent EVENT_BEAT_RIVAL_IN_MT_MOON playmapmusic end @@ -175,12 +175,12 @@ MountMoon_MapEventHeader: warp_def $3, $19, 3, MOUNT_MOON warp_def $d, $19, 4, MOUNT_MOON -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_SILVER, 3, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL + object_event SPRITE_SILVER, 3, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index 8dfe26579..954ab2d26 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -5,7 +5,7 @@ const_value set 2 const MOUNTMOONGIFTSHOP_LASS2 MountMoonGiftShop_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -36,15 +36,15 @@ MountMoonGiftShop_MapEventHeader: warp_def $7, $3, 3, MOUNT_MOON_SQUARE warp_def $7, $4, 3, MOUNT_MOON_SQUARE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_GRAMPS, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 - person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 - person_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, MORN, 0, PERSONTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 - person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, DAY, 0, PERSONTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 + object_event SPRITE_GRAMPS, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 + object_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 + object_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 + object_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index d92ede729..0bfff1457 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -4,16 +4,16 @@ const_value set 2 const MOUNTMOONSQUARE_ROCK MountMoonSquare_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - maptrigger .DummyTrigger + scene_script .DummyScene .MapCallbacks: db 2 dbw MAPCALLBACK_NEWMAP, .DisappearMoonStone dbw MAPCALLBACK_OBJECTS, .DisappearRock -.DummyTrigger: +.DummyScene: end .DisappearMoonStone: @@ -143,17 +143,17 @@ MountMoonSquare_MapEventHeader: warp_def $b, $16, 6, MOUNT_MOON warp_def $7, $d, 1, MOUNT_MOON_GIFT_SHOP -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $b, $7, ClefairyDance + coord_event 0, $b, $7, ClefairyDance -.Signposts: +.BGEvents: db 2 - signpost 7, 7, SIGNPOST_ITEM, MountMoonSquareHiddenMoonStone - signpost 7, 17, SIGNPOST_READ, DontLitterSign + bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone + bg_event 7, 17, BGEVENT_READ, DontLitterSign -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_FAIRY, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY - person_event SPRITE_FAIRY, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY - person_event SPRITE_ROCK, 7, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK + object_event SPRITE_FAIRY, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY + object_event SPRITE_FAIRY, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY + object_event SPRITE_ROCK, 7, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 4708b7c60..2c594870e 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -11,7 +11,7 @@ const_value set 2 const MOUNTMORTAR1FINSIDE_POKE_BALL7 MountMortar1FInside_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -130,22 +130,22 @@ MountMortar1FInside_MapEventHeader: warp_def $13, $3, 1, MOUNT_MORTAR_B1F warp_def $9, $9, 2, MOUNT_MORTAR_2F_INSIDE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 11, 30, SIGNPOST_ITEM, MountMortar1FInsideHiddenMaxRepel + bg_event 11, 30, BGEVENT_ITEM, MountMortar1FInsideHiddenMaxRepel -.PersonEvents: +.ObjectEvents: db 10 - person_event SPRITE_BOULDER, 43, 21, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MountMortar1FBoulder, -1 - person_event SPRITE_POKE_BALL, 38, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideEscapeRope, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE - person_event SPRITE_POKE_BALL, 10, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideMaxRevive, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE - person_event SPRITE_POKE_BALL, 27, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideHyperPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION - person_event SPRITE_POKE_BALL, 20, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideMaxPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION - person_event SPRITE_POKE_BALL, 19, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideNugget, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET - person_event SPRITE_SUPER_NERD, 43, 33, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacMiller, -1 - person_event SPRITE_SUPER_NERD, 28, 24, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerSupernerdMarkus, -1 - person_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideIron, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON - person_event SPRITE_POKE_BALL, 17, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideUltraBall, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL + object_event SPRITE_BOULDER, 43, 21, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortar1FBoulder, -1 + object_event SPRITE_POKE_BALL, 38, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideEscapeRope, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE + object_event SPRITE_POKE_BALL, 10, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxRevive, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE + object_event SPRITE_POKE_BALL, 27, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideHyperPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION + object_event SPRITE_POKE_BALL, 20, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION + object_event SPRITE_POKE_BALL, 19, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideNugget, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET + object_event SPRITE_SUPER_NERD, 43, 33, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacMiller, -1 + object_event SPRITE_SUPER_NERD, 28, 24, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdMarkus, -1 + object_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideIron, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON + object_event SPRITE_POKE_BALL, 17, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideUltraBall, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index 069874d8f..0cda940bb 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -3,7 +3,7 @@ const_value set 2 const MOUNTMORTAR1FOUTSIDE_POKE_BALL2 MountMortar1FOutside_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -35,14 +35,14 @@ MountMortar1FOutside_MapEventHeader: warp_def $d, $7, 3, MOUNT_MORTAR_1F_INSIDE warp_def $d, $21, 4, MOUNT_MORTAR_1F_INSIDE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 22, 25, SIGNPOST_ITEM, MountMortar1FOutsideHiddenHyperPotion + bg_event 22, 25, BGEVENT_ITEM, MountMortar1FOutsideHiddenHyperPotion -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKE_BALL, 15, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER - person_event SPRITE_POKE_BALL, 18, 31, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE + object_event SPRITE_POKE_BALL, 15, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER + object_event SPRITE_POKE_BALL, 18, 31, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index a78d8453e..cc159273d 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -8,7 +8,7 @@ const_value set 2 const MOUNTMORTAR2FINSIDE_SUPER_NERD MountMortar2FInside_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -76,19 +76,19 @@ MountMortar2FInside_MapEventHeader: warp_def $21, $11, 4, MOUNT_MORTAR_1F_OUTSIDE warp_def $5, $3, 6, MOUNT_MORTAR_1F_INSIDE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 8, 24, SIGNPOST_ITEM, MountMortar2FInsideHiddenFullRestore + bg_event 8, 24, BGEVENT_ITEM, MountMortar2FInsideHiddenFullRestore -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_POKE_BALL, 22, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION - person_event SPRITE_POKE_BALL, 33, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY - person_event SPRITE_POKE_BALL, 17, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL - person_event SPRITE_POKE_BALL, 5, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE - person_event SPRITE_POKE_BALL, 11, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER - person_event SPRITE_POKE_BALL, 5, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE - person_event SPRITE_SUPER_NERD, 26, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerSupernerdHugh, -1 + object_event SPRITE_POKE_BALL, 22, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION + object_event SPRITE_POKE_BALL, 33, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY + object_event SPRITE_POKE_BALL, 17, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL + object_event SPRITE_POKE_BALL, 5, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE + object_event SPRITE_POKE_BALL, 11, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER + object_event SPRITE_POKE_BALL, 5, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE + object_event SPRITE_SUPER_NERD, 26, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdHugh, -1 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 306189b5a..3b7764961 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -8,7 +8,7 @@ const_value set 2 const MOUNTMORTARB1F_POKE_BALL5 MountMortarB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -144,19 +144,19 @@ MountMortarB1F_MapEventHeader: warp_def $3, $3, 5, MOUNT_MORTAR_1F_INSIDE warp_def $1d, $13, 7, MOUNT_MORTAR_1F_OUTSIDE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 6, 4, SIGNPOST_ITEM, MountMortarB1FHiddenMaxRevive + bg_event 6, 4, BGEVENT_ITEM, MountMortarB1FHiddenMaxRevive -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_POKE_BALL, 12, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION - person_event SPRITE_POKE_BALL, 16, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS - person_event SPRITE_BOULDER, 10, 9, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1 - person_event SPRITE_BLACK_BELT, 4, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1 - person_event SPRITE_POKE_BALL, 24, 34, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE - person_event SPRITE_POKE_BALL, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER - person_event SPRITE_POKE_BALL, 26, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP + object_event SPRITE_POKE_BALL, 12, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION + object_event SPRITE_POKE_BALL, 16, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS + object_event SPRITE_BOULDER, 10, 9, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1 + object_event SPRITE_BLACK_BELT, 4, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1 + object_event SPRITE_POKE_BALL, 24, 34, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE + object_event SPRITE_POKE_BALL, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER + object_event SPRITE_POKE_BALL, 26, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 1d054f235..7845e98f5 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const MOVEDELETERSHOUSE_SUPER_NERD MoveDeletersHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -28,14 +28,14 @@ MoveDeletersHouse_MapEventHeader: warp_def $7, $2, 6, BLACKTHORN_CITY warp_def $7, $3, 6, BLACKTHORN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, MoveDeletersHouseBookshelf - signpost 1, 1, SIGNPOST_READ, MoveDeletersHouseBookshelf + bg_event 1, 0, BGEVENT_READ, MoveDeletersHouseBookshelf + bg_event 1, 1, BGEVENT_READ, MoveDeletersHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MoveDeleter, -1 + object_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MoveDeleter, -1 diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 35b7dbcf8..df4b2fb8a 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -6,7 +6,7 @@ const_value set 2 const MRFUJISHOUSE_PIDGEY MrFujisHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -88,18 +88,18 @@ MrFujisHouse_MapEventHeader: warp_def $7, $2, 2, LAVENDER_TOWN warp_def $7, $3, 2, LAVENDER_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, MrFujisHouseBookshelf - signpost 1, 1, SIGNPOST_READ, MrFujisHouseBookshelf + bg_event 1, 0, BGEVENT_READ, MrFujisHouseBookshelf + bg_event 1, 1, BGEVENT_READ, MrFujisHouseBookshelf -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_SUPER_NERD, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1 - person_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1 - person_event SPRITE_RHYDON, 4, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MrFujisPsyduck, -1 - person_event SPRITE_GROWLITHE, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, MrFujisNidorino, -1 - person_event SPRITE_MOLTRES, 3, 1, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, MrFujisPidgey, -1 + object_event SPRITE_SUPER_NERD, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1 + object_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1 + object_event SPRITE_RHYDON, 4, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisPsyduck, -1 + object_event SPRITE_GROWLITHE, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFujisNidorino, -1 + object_event SPRITE_MOLTRES, 3, 1, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MrFujisPidgey, -1 diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 8a322339d..bd0650481 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -3,10 +3,10 @@ const_value set 2 const MRPOKEMONSHOUSE_OAK MrPokemonsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .MeetMrPokemon - maptrigger .DummyTrigger + scene_script .MeetMrPokemon + scene_script .DummyScene .MapCallbacks: db 0 @@ -15,7 +15,7 @@ MrPokemonsHouse_MapScriptHeader: priorityjump .MrPokemonEvent end -.DummyTrigger: +.DummyScene: end .MrPokemonEvent: @@ -125,9 +125,9 @@ MrPokemonsHouse_OakScript: setevent EVENT_RIVAL_NEW_BARK_TOWN setevent EVENT_KRISS_HOUSE_1F_NEIGHBOR clearevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR - dotrigger $1 - domaptrigger CHERRYGROVE_CITY, $1 - domaptrigger ELMS_LAB, $3 + setscene $1 + setmapscene CHERRYGROVE_CITY, $1 + setmapscene ELMS_LAB, $3 specialphonecall SPECIALCALL_ROBBED clearevent EVENT_COP_IN_ELMS_LAB checkevent EVENT_GOT_TOTODILE_FROM_ELM @@ -381,18 +381,18 @@ MrPokemonsHouse_MapEventHeader: warp_def $7, $2, 2, ROUTE_30 warp_def $7, $3, 2, ROUTE_30 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 5 - signpost 1, 0, SIGNPOST_READ, MapMrPokemonsHouseSignpost1Script - signpost 1, 1, SIGNPOST_READ, MapMrPokemonsHouseSignpost1Script - signpost 1, 6, SIGNPOST_READ, MapMrPokemonsHouseSignpost3Script - signpost 1, 7, SIGNPOST_READ, MapMrPokemonsHouseSignpost3Script - signpost 4, 6, SIGNPOST_READ, MapMrPokemonsHouseSignpost4Script + bg_event 1, 0, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script + bg_event 1, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script + bg_event 1, 6, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script + bg_event 1, 7, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script + bg_event 4, 6, BGEVENT_READ, MapMrPokemonsHouseSignpost4Script -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_GENTLEMAN, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1 - person_event SPRITE_OAK, 5, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK + object_event SPRITE_GENTLEMAN, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1 + object_event SPRITE_OAK, 5, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index e961a319d..0b0c09115 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const MRPSYCHICSHOUSE_FISHING_GURU MrPsychicsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -56,14 +56,14 @@ MrPsychicsHouse_MapEventHeader: warp_def $7, $2, 5, SAFFRON_CITY warp_def $7, $3, 5, SAFFRON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, MrPsychicsHouseBookshelf - signpost 1, 1, SIGNPOST_READ, MrPsychicsHouseBookshelf + bg_event 1, 0, BGEVENT_READ, MrPsychicsHouseBookshelf + bg_event 1, 1, BGEVENT_READ, MrPsychicsHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, MrPsychic, -1 + object_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrPsychic, -1 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index e0a228bb2..86538fe0d 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -15,7 +15,7 @@ const_value set 2 const NATIONALPARK_POKE_BALL2 NationalPark_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -525,29 +525,29 @@ NationalPark_MapEventHeader: warp_def $2f, $a, 1, ROUTE_35_NATIONAL_PARK_GATE warp_def $2f, $b, 2, ROUTE_35_NATIONAL_PARK_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 44, 14, SIGNPOST_READ, MapNationalParkSignpost0Script - signpost 31, 27, SIGNPOST_READ, MapNationalParkSignpost1Script - signpost 47, 6, SIGNPOST_ITEM, NationalParkHiddenFullHeal - signpost 4, 12, SIGNPOST_READ, MapNationalParkSignpost3Script + bg_event 44, 14, BGEVENT_READ, MapNationalParkSignpost0Script + bg_event 31, 27, BGEVENT_READ, MapNationalParkSignpost1Script + bg_event 47, 6, BGEVENT_ITEM, NationalParkHiddenFullHeal + bg_event 4, 12, BGEVENT_READ, MapNationalParkSignpost3Script -.PersonEvents: +.ObjectEvents: db 14 - person_event SPRITE_LASS, 24, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, NationalParkLassScript, -1 - person_event SPRITE_POKEFAN_F, 4, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1 - person_event SPRITE_TEACHER, 40, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1 - person_event SPRITE_YOUNGSTER, 41, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NationalParkYoungster1Script, -1 - person_event SPRITE_YOUNGSTER, 41, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, NationalParkYoungster2Script, -1 - person_event SPRITE_TEACHER, 41, 17, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NationalParkTeacherScript, -1 - person_event SPRITE_GROWLITHE, 40, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NationalParkPersian, -1 - person_event SPRITE_YOUNGSTER, 23, 27, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyJack1, -1 - person_event SPRITE_POKEFAN_F, 29, 18, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1 - person_event SPRITE_POKEFAN_M, 9, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1 - person_event SPRITE_LASS, 14, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerLassKrise, -1 - person_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL - person_event SPRITE_GAMEBOY_KID, 6, 26, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1 - person_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG + object_event SPRITE_LASS, 24, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkLassScript, -1 + object_event SPRITE_POKEFAN_F, 4, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1 + object_event SPRITE_TEACHER, 40, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1 + object_event SPRITE_YOUNGSTER, 41, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster1Script, -1 + object_event SPRITE_YOUNGSTER, 41, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster2Script, -1 + object_event SPRITE_TEACHER, 41, 17, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkTeacherScript, -1 + object_event SPRITE_GROWLITHE, 40, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPersian, -1 + object_event SPRITE_YOUNGSTER, 23, 27, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJack1, -1 + object_event SPRITE_POKEFAN_F, 29, 18, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1 + object_event SPRITE_POKEFAN_M, 9, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1 + object_event SPRITE_LASS, 14, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassKrise, -1 + object_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL + object_event SPRITE_GAMEBOY_KID, 6, 26, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1 + object_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index 2ad457444..9cebf82fd 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -13,7 +13,7 @@ const_value set 2 const NATIONALPARKBUGCONTEST_POKE_BALL2 NationalParkBugContest_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -232,27 +232,27 @@ NationalParkBugContest_MapEventHeader: warp_def $2f, $a, 1, ROUTE_35_NATIONAL_PARK_GATE warp_def $2f, $b, 1, ROUTE_35_NATIONAL_PARK_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 44, 14, SIGNPOST_READ, MapNationalParkBugContestSignpost0Script - signpost 31, 27, SIGNPOST_READ, MapNationalParkBugContestSignpost1Script - signpost 47, 6, SIGNPOST_ITEM, NationalParkBugContestHiddenFullHeal - signpost 4, 12, SIGNPOST_READ, MapNationalParkBugContestSignpost3Script + bg_event 44, 14, BGEVENT_READ, MapNationalParkBugContestSignpost0Script + bg_event 31, 27, BGEVENT_READ, MapNationalParkBugContestSignpost1Script + bg_event 47, 6, BGEVENT_ITEM, NationalParkBugContestHiddenFullHeal + bg_event 4, 12, BGEVENT_READ, MapNationalParkBugContestSignpost3Script -.PersonEvents: +.ObjectEvents: db 12 - person_event SPRITE_YOUNGSTER, 29, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A - person_event SPRITE_YOUNGSTER, 22, 28, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A - person_event SPRITE_ROCKER, 18, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A - person_event SPRITE_POKEFAN_M, 13, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A - person_event SPRITE_YOUNGSTER, 9, 23, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A - person_event SPRITE_YOUNGSTER, 13, 27, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c914, EVENT_BUG_CATCHING_CONTESTANT_6A - person_event SPRITE_LASS, 23, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A - person_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A - person_event SPRITE_YOUNGSTER, 8, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A - person_event SPRITE_YOUNGSTER, 34, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A - person_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL - person_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG + object_event SPRITE_YOUNGSTER, 29, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A + object_event SPRITE_YOUNGSTER, 22, 28, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A + object_event SPRITE_ROCKER, 18, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A + object_event SPRITE_POKEFAN_M, 13, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A + object_event SPRITE_YOUNGSTER, 9, 23, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A + object_event SPRITE_YOUNGSTER, 13, 27, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c914, EVENT_BUG_CATCHING_CONTESTANT_6A + object_event SPRITE_LASS, 23, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A + object_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A + object_event SPRITE_YOUNGSTER, 8, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A + object_event SPRITE_YOUNGSTER, 34, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A + object_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL + object_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index ff74da9f1..3ad5cd2bf 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -4,19 +4,19 @@ const_value set 2 const NEWBARKTOWN_SILVER NewBarkTown_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 dbw MAPCALLBACK_NEWMAP, .FlyPoint -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end .FlyPoint: @@ -24,7 +24,7 @@ NewBarkTown_MapScriptHeader: clearevent EVENT_FIRST_TIME_BANKING_WITH_MOM return -NewBarkTown_TeacherStopsYouTrigger1: +NewBarkTown_TeacherStopsYouScene1: playmusic MUSIC_MOM spriteface NEWBARKTOWN_TEACHER, LEFT opentext @@ -47,7 +47,7 @@ NewBarkTown_TeacherStopsYouTrigger1: special RestartMapMusic end -NewBarkTown_TeacherStopsYouTrigger2: +NewBarkTown_TeacherStopsYouScene2: playmusic MUSIC_MOM spriteface NEWBARKTOWN_TEACHER, LEFT opentext @@ -292,20 +292,20 @@ NewBarkTown_MapEventHeader: warp_def $b, $3, 1, KRISS_NEIGHBORS_HOUSE warp_def $d, $b, 1, ELMS_HOUSE -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $8, $1, NewBarkTown_TeacherStopsYouTrigger1 - xy_trigger 0, $9, $1, NewBarkTown_TeacherStopsYouTrigger2 + coord_event 0, $8, $1, NewBarkTown_TeacherStopsYouScene1 + coord_event 0, $9, $1, NewBarkTown_TeacherStopsYouScene2 -.Signposts: +.BGEvents: db 4 - signpost 8, 8, SIGNPOST_READ, NewBarkTownSign - signpost 5, 11, SIGNPOST_READ, MapNewBarkTownSignpost1Script - signpost 3, 3, SIGNPOST_READ, MapNewBarkTownSignpost2Script - signpost 13, 9, SIGNPOST_READ, MapNewBarkTownSignpost3Script + bg_event 8, 8, BGEVENT_READ, NewBarkTownSign + bg_event 5, 11, BGEVENT_READ, MapNewBarkTownSignpost1Script + bg_event 3, 3, BGEVENT_READ, MapNewBarkTownSignpost2Script + bg_event 13, 9, BGEVENT_READ, MapNewBarkTownSignpost3Script -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_TEACHER, 8, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1 - person_event SPRITE_FISHER, 9, 12, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1 - person_event SPRITE_SILVER, 2, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN + object_event SPRITE_TEACHER, 8, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1 + object_event SPRITE_FISHER, 9, 12, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1 + object_event SPRITE_SILVER, 2, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index e89ccd43b..d2b67c0a0 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -5,13 +5,13 @@ const_value set 2 const OAKSLAB_SCIENTIST3 OaksLab_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -.DummyTrigger: +.DummyScene: end Oak: @@ -265,31 +265,31 @@ OaksLab_MapEventHeader: warp_def $b, $4, 3, PALLET_TOWN warp_def $b, $5, 3, PALLET_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 16 - signpost 1, 6, SIGNPOST_READ, OaksLabBookshelf - signpost 1, 7, SIGNPOST_READ, OaksLabBookshelf - signpost 1, 8, SIGNPOST_READ, OaksLabBookshelf - signpost 1, 9, SIGNPOST_READ, OaksLabBookshelf - signpost 7, 0, SIGNPOST_READ, OaksLabBookshelf - signpost 7, 1, SIGNPOST_READ, OaksLabBookshelf - signpost 7, 2, SIGNPOST_READ, OaksLabBookshelf - signpost 7, 3, SIGNPOST_READ, OaksLabBookshelf - signpost 7, 6, SIGNPOST_READ, OaksLabBookshelf - signpost 7, 7, SIGNPOST_READ, OaksLabBookshelf - signpost 7, 8, SIGNPOST_READ, OaksLabBookshelf - signpost 7, 9, SIGNPOST_READ, OaksLabBookshelf - signpost 0, 4, SIGNPOST_READ, OaksLabPoster1 - signpost 0, 5, SIGNPOST_READ, OaksLabPoster2 - signpost 3, 9, SIGNPOST_READ, OaksLabTrashcan - signpost 1, 0, SIGNPOST_READ, OaksLabPC + bg_event 1, 6, BGEVENT_READ, OaksLabBookshelf + bg_event 1, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 1, 8, BGEVENT_READ, OaksLabBookshelf + bg_event 1, 9, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 0, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 1, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 2, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 3, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 6, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 8, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 9, BGEVENT_READ, OaksLabBookshelf + bg_event 0, 4, BGEVENT_READ, OaksLabPoster1 + bg_event 0, 5, BGEVENT_READ, OaksLabPoster2 + bg_event 3, 9, BGEVENT_READ, OaksLabTrashcan + bg_event 1, 0, BGEVENT_READ, OaksLabPC -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_OAK, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Oak, -1 - person_event SPRITE_SCIENTIST, 8, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant1Script, -1 - person_event SPRITE_SCIENTIST, 9, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant2Script, -1 - person_event SPRITE_SCIENTIST, 4, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant3Script, -1 + object_event SPRITE_OAK, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1 + object_event SPRITE_SCIENTIST, 8, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1 + object_event SPRITE_SCIENTIST, 9, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1 + object_event SPRITE_SCIENTIST, 4, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant3Script, -1 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 01216d0bb..fef87b535 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -4,7 +4,7 @@ const_value set 2 const OLIVINECAFE_SAILOR2 OlivineCafe_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -87,14 +87,14 @@ OlivineCafe_MapEventHeader: warp_def $7, $2, 7, OLIVINE_CITY warp_def $7, $3, 7, OLIVINE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_SAILOR, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1 - person_event SPRITE_FISHING_GURU, 3, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1 - person_event SPRITE_SAILOR, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1 + object_event SPRITE_SAILOR, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1 + object_event SPRITE_FISHING_GURU, 3, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1 + object_event SPRITE_SAILOR, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index e52dc54f6..fbed4e323 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -5,19 +5,19 @@ const_value set 2 const OLIVINECITY_OLIVINE_RIVAL OlivineCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 dbw MAPCALLBACK_NEWMAP, .FlyPoint -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end .FlyPoint: @@ -41,7 +41,7 @@ UnknownScript_0x1a8833: applymovement PLAYER, MovementData_0x1a88f4 spriteface PLAYER, RIGHT applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db - dotrigger $1 + setscene $1 disappear OLIVINECITY_OLIVINE_RIVAL special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY @@ -66,7 +66,7 @@ UnknownScript_0x1a886b: spriteface PLAYER, RIGHT applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8 disappear OLIVINECITY_OLIVINE_RIVAL - dotrigger $1 + setscene $1 special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY special MapCallbackSprites_LoadUsedSpritesGFX @@ -305,24 +305,24 @@ OlivineCity_MapEventHeader: warp_def $1b, $13, 1, OLIVINE_PORT_PASSAGE warp_def $1b, $14, 2, OLIVINE_PORT_PASSAGE -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $c, $d, UnknownScript_0x1a8833 - xy_trigger 0, $d, $d, UnknownScript_0x1a886b + coord_event 0, $c, $d, UnknownScript_0x1a8833 + coord_event 0, $d, $d, UnknownScript_0x1a886b -.Signposts: +.BGEvents: db 7 - signpost 11, 17, SIGNPOST_READ, OlivineCitySign - signpost 24, 20, SIGNPOST_READ, OlivineCityPortSign - signpost 11, 7, SIGNPOST_READ, OlivineGymSign - signpost 28, 30, SIGNPOST_READ, OlivineLighthouseSign - signpost 23, 3, SIGNPOST_READ, OlivineCityBattleTowerSign - signpost 21, 14, SIGNPOST_READ, OlivineCityPokecenterSign - signpost 17, 20, SIGNPOST_READ, OlivineCityMartSign + bg_event 11, 17, BGEVENT_READ, OlivineCitySign + bg_event 24, 20, BGEVENT_READ, OlivineCityPortSign + bg_event 11, 7, BGEVENT_READ, OlivineGymSign + bg_event 28, 30, BGEVENT_READ, OlivineLighthouseSign + bg_event 23, 3, BGEVENT_READ, OlivineCityBattleTowerSign + bg_event 21, 14, BGEVENT_READ, OlivineCityPokecenterSign + bg_event 17, 20, BGEVENT_READ, OlivineCityMartSign -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_SAILOR, 27, 26, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineCitySailor1Script, -1 - person_event SPRITE_STANDING_YOUNGSTER, 13, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a88a6, -1 - person_event SPRITE_SAILOR, 21, 17, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineCitySailor2Script, -1 - person_event SPRITE_OLIVINE_RIVAL, 11, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY + object_event SPRITE_SAILOR, 27, 26, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor1Script, -1 + object_event SPRITE_STANDING_YOUNGSTER, 13, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a88a6, -1 + object_event SPRITE_SAILOR, 21, 17, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor2Script, -1 + object_event SPRITE_OLIVINE_RIVAL, 11, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 572c4b4ed..8fe953932 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const OLIVINEGOODRODHOUSE_FISHING_GURU OlivineGoodRodHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -91,12 +91,12 @@ OlivineGoodRodHouse_MapEventHeader: warp_def $7, $2, 6, OLIVINE_CITY warp_def $7, $3, 6, OLIVINE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoodRodGuru, -1 + object_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoodRodGuru, -1 diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 14d412df6..128cbca70 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -3,7 +3,7 @@ const_value set 2 const OLIVINEGYM_GYM_GUY OlivineGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -28,7 +28,7 @@ JasmineScript_0x9c12f: waitsfx setflag ENGINE_MINERALBADGE checkcode VAR_BADGES - scall OlivineGymTriggerRockets + scall OlivineGymActivateRockets .FightDone: checkevent EVENT_GOT_TM23_IRON_TAIL iftrue .GotIronTail @@ -49,7 +49,7 @@ JasmineScript_0x9c12f: closetext end -OlivineGymTriggerRockets: +OlivineGymActivateRockets: if_equal 7, .RadioTowerRockets if_equal 6, .GoldenrodRockets end @@ -206,15 +206,15 @@ OlivineGym_MapEventHeader: warp_def $f, $4, 2, OLIVINE_CITY warp_def $f, $5, 2, OLIVINE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 13, 3, SIGNPOST_READ, OlivineGymStatue - signpost 13, 6, SIGNPOST_READ, OlivineGymStatue + bg_event 13, 3, BGEVENT_READ, OlivineGymStatue + bg_event 13, 6, BGEVENT_READ, OlivineGymStatue -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_JASMINE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE - person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OlivineGymGuyScript, -1 + object_event SPRITE_JASMINE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE + object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1 diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index b3bc7e4d3..23b568cf0 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -3,7 +3,7 @@ const_value set 2 const OLIVINEHOUSEBETA_RHYDON OlivineHouseBeta_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -48,15 +48,15 @@ OlivineHouseBeta_MapEventHeader: warp_def $7, $2, 4, OLIVINE_CITY warp_def $7, $3, 4, OLIVINE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, OlivineHouseBetaBookshelf1 - signpost 1, 1, SIGNPOST_READ, OlivineHouseBetaBookshelf2 + bg_event 1, 0, BGEVENT_READ, OlivineHouseBetaBookshelf1 + bg_event 1, 1, BGEVENT_READ, OlivineHouseBetaBookshelf2 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1 - person_event SPRITE_RHYDON, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1 + object_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1 + object_event SPRITE_RHYDON, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1 diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 40dda9638..4c5ead8cc 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -3,7 +3,7 @@ const_value set 2 const OLIVINELIGHTHOUSE1F_POKEFAN_F OlivineLighthouse1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -48,13 +48,13 @@ OlivineLighthouse1F_MapEventHeader: warp_def $d, $10, 3, OLIVINE_LIGHTHOUSE_2F warp_def $d, $11, 4, OLIVINE_LIGHTHOUSE_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_SAILOR, 2, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineLighthouse1FSailorScript, -1 - person_event SPRITE_POKEFAN_F, 9, 16, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineLighthouse1FPokefanFScript, -1 + object_event SPRITE_SAILOR, 2, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FSailorScript, -1 + object_event SPRITE_POKEFAN_F, 9, 16, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FPokefanFScript, -1 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index d55515fe3..be2632285 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -3,7 +3,7 @@ const_value set 2 const OLIVINELIGHTHOUSE2F_GENTLEMAN OlivineLighthouse2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -217,13 +217,13 @@ OlivineLighthouse2F_MapEventHeader: warp_def $b, $10, 4, OLIVINE_LIGHTHOUSE_3F warp_def $b, $11, 5, OLIVINE_LIGHTHOUSE_3F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_SAILOR, 3, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSailorHuey1, -1 - person_event SPRITE_GENTLEMAN, 8, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1 + object_event SPRITE_SAILOR, 3, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorHuey1, -1 + object_event SPRITE_GENTLEMAN, 8, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 2b15d3487..847de0e44 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -5,7 +5,7 @@ const_value set 2 const OLIVINELIGHTHOUSE3F_POKE_BALL OlivineLighthouse3F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -128,15 +128,15 @@ OlivineLighthouse3F_MapEventHeader: warp_def $3, $8, 7, OLIVINE_LIGHTHOUSE_4F warp_def $3, $9, 8, OLIVINE_LIGHTHOUSE_4F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_SAILOR, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerSailorTerrell, -1 - person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerGentlemanPreston, -1 - person_event SPRITE_YOUNGSTER, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperTheo, -1 - person_event SPRITE_POKE_BALL, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER + object_event SPRITE_SAILOR, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1 + object_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1 + object_event SPRITE_YOUNGSTER, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperTheo, -1 + object_event SPRITE_POKE_BALL, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index f9ff1d86c..321c7a96f 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -3,7 +3,7 @@ const_value set 2 const OLIVINELIGHTHOUSE4F_LASS OlivineLighthouse4F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -98,13 +98,13 @@ OlivineLighthouse4F_MapEventHeader: warp_def $7, $10, 4, OLIVINE_LIGHTHOUSE_5F warp_def $7, $11, 5, OLIVINE_LIGHTHOUSE_5F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_SAILOR, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSailorKent, -1 - person_event SPRITE_LASS, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerLassConnie, -1 + object_event SPRITE_SAILOR, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorKent, -1 + object_event SPRITE_LASS, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassConnie, -1 diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 08a9c4309..2c166bc69 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -6,7 +6,7 @@ const_value set 2 const OLIVINELIGHTHOUSE5F_POKE_BALL3 OlivineLighthouse5F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -105,17 +105,17 @@ OlivineLighthouse5F_MapEventHeader: warp_def $5, $10, 2, OLIVINE_LIGHTHOUSE_6F warp_def $5, $11, 3, OLIVINE_LIGHTHOUSE_6F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 13, 3, SIGNPOST_ITEM, OlivineLighthouse5FHiddenHyperPotion + bg_event 13, 3, BGEVENT_ITEM, OlivineLighthouse5FHiddenHyperPotion -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_SAILOR, 11, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSailorErnest, -1 - person_event SPRITE_YOUNGSTER, 3, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerBird_keeperDenis, -1 - person_event SPRITE_POKE_BALL, 12, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY - person_event SPRITE_POKE_BALL, 15, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL - person_event SPRITE_POKE_BALL, 13, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER + object_event SPRITE_SAILOR, 11, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1 + object_event SPRITE_YOUNGSTER, 3, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBird_keeperDenis, -1 + object_event SPRITE_POKE_BALL, 12, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY + object_event SPRITE_POKE_BALL, 15, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL + object_event SPRITE_POKE_BALL, 13, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 335adeec9..713d08d43 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -4,7 +4,7 @@ const_value set 2 const OLIVINELIGHTHOUSE6F_POKE_BALL OlivineLighthouse6F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -267,14 +267,14 @@ OlivineLighthouse6F_MapEventHeader: warp_def $5, $10, 6, OLIVINE_LIGHTHOUSE_5F warp_def $5, $11, 7, OLIVINE_LIGHTHOUSE_5F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_JASMINE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE - person_event SPRITE_MONSTER, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1 - person_event SPRITE_POKE_BALL, 4, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION + object_event SPRITE_JASMINE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE + object_event SPRITE_MONSTER, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1 + object_event SPRITE_POKE_BALL, 4, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index e18ce3f91..db193c7e4 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -4,7 +4,7 @@ const_value set 2 const OLIVINEMART_LASS OlivineMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -54,14 +54,14 @@ OlivineMart_MapEventHeader: warp_def $7, $2, 8, OLIVINE_CITY warp_def $7, $3, 8, OLIVINE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1 - person_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineMartLassScript, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1 + object_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1 + object_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1 diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm index 8454b786a..fd4bf2556 100644 --- a/maps/OlivinePokecenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const OLIVINEPOKECENTER1F_TEACHER OlivinePokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -57,15 +57,15 @@ OlivinePokecenter1F_MapEventHeader: warp_def $7, $4, 1, OLIVINE_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x9c002, -1 - person_event SPRITE_FISHING_GURU, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1 - person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1 - person_event SPRITE_TEACHER, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivinePokecenter1FTeacherScript, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9c002, -1 + object_event SPRITE_FISHING_GURU, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1 + object_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1 + object_event SPRITE_TEACHER, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FTeacherScript, -1 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 60e5d4d04..d0972ced3 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -8,15 +8,15 @@ const_value set 2 const OLIVINEPORT_COOLTRAINER_F OlivinePort_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .LeaveFastShip + scene_script .DummyScene0 + scene_script .LeaveFastShip .MapCallbacks: db 0 -.DummyTrigger0: +.DummyScene0: end .LeaveFastShip: @@ -26,7 +26,7 @@ OlivinePort_MapScriptHeader: .LeaveFastShipScript: applymovement PLAYER, MovementData_0x74a32 appear OLIVINEPORT_SAILOR1 - dotrigger $0 + setscene $0 setevent EVENT_GAVE_KURT_APRICORNS blackoutmod OLIVINE_CITY end @@ -64,7 +64,7 @@ SailorScript_0x748c0: UnknownScript_0x7490a: clearevent EVENT_FAST_SHIP_DESTINATION_OLIVINE appear OLIVINEPORT_SAILOR1 - domaptrigger FAST_SHIP_1F, $1 + setmapscene FAST_SHIP_1F, $1 warp FAST_SHIP_1F, $19, $1 end @@ -394,20 +394,20 @@ OlivinePort_MapEventHeader: warp_def $7, $b, 5, OLIVINE_PORT_PASSAGE warp_def $17, $7, 1, FAST_SHIP_1F -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $f, $7, UnknownScript_0x7491f + coord_event 0, $f, $7, UnknownScript_0x7491f -.Signposts: +.BGEvents: db 1 - signpost 22, 1, SIGNPOST_ITEM, OlivinePortHiddenProtein + bg_event 22, 1, BGEVENT_ITEM, OlivinePortHiddenProtein -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_SAILOR, 23, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY - person_event SPRITE_SAILOR, 15, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME - person_event SPRITE_SAILOR, 15, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME - person_event SPRITE_FISHING_GURU, 14, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME - person_event SPRITE_FISHING_GURU, 14, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME - person_event SPRITE_YOUNGSTER, 15, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME - person_event SPRITE_COOLTRAINER_F, 15, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x74a22, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME + object_event SPRITE_SAILOR, 23, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY + object_event SPRITE_SAILOR, 15, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + object_event SPRITE_SAILOR, 15, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME + object_event SPRITE_FISHING_GURU, 14, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + object_event SPRITE_FISHING_GURU, 14, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + object_event SPRITE_YOUNGSTER, 15, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME + object_event SPRITE_COOLTRAINER_F, 15, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x74a22, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 2f7a145bc..08f4532c0 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -2,7 +2,7 @@ const_value set 2 const OLIVINEPORTPASSAGE_POKEFAN_M OlivinePortPassage_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -31,12 +31,12 @@ OlivinePortPassage_MapEventHeader: warp_def $2, $3, 3, OLIVINE_PORT_PASSAGE warp_def $e, $3, 1, OLIVINE_PORT -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKEFAN_M, 1, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivinePortPassagePokefanMScript, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M + object_event SPRITE_POKEFAN_M, 1, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortPassagePokefanMScript, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index b819ab567..f3537224b 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const OLIVINEPUNISHMENTSPEECHHOUSE_LASS OlivinePunishmentSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -48,15 +48,15 @@ OlivinePunishmentSpeechHouse_MapEventHeader: warp_def $7, $2, 5, OLIVINE_CITY warp_def $7, $3, 5, OLIVINE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, OlivinePunishmentSpeechHouseBookshelf1 - signpost 1, 1, SIGNPOST_READ, OlivinePunishmentSpeechHouseBookshelf2 + bg_event 1, 0, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf1 + bg_event 1, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf2 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKEFAN_M, 2, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDad, -1 - person_event SPRITE_LASS, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDaughter, -1 + object_event SPRITE_POKEFAN_M, 2, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDad, -1 + object_event SPRITE_LASS, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDaughter, -1 diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index bde18bee1..96ea2636b 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const OLIVINETIMSHOUSE_TIM OlivineTimsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -28,14 +28,14 @@ OlivineTimsHouse_MapEventHeader: warp_def $7, $2, 3, OLIVINE_CITY warp_def $7, $3, 3, OLIVINE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, TimsHouseBookshelf - signpost 1, 1, SIGNPOST_READ, TimsHouseBookshelf + bg_event 1, 0, BGEVENT_READ, TimsHouseBookshelf + bg_event 1, 1, BGEVENT_READ, TimsHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Tim, -1 + object_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Tim, -1 diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 895e79e9c..b7f48f47d 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -3,7 +3,7 @@ const_value set 2 const PALLETTOWN_FISHER PalletTown_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -79,17 +79,17 @@ PalletTown_MapEventHeader: warp_def $5, $d, 1, BLUES_HOUSE warp_def $b, $c, 1, OAKS_LAB -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 9, 7, SIGNPOST_READ, PalletTownSign - signpost 5, 3, SIGNPOST_READ, RedsHouseSign - signpost 13, 13, SIGNPOST_READ, OaksLabSign - signpost 5, 11, SIGNPOST_READ, BluesHouseSign + bg_event 9, 7, BGEVENT_READ, PalletTownSign + bg_event 5, 3, BGEVENT_READ, RedsHouseSign + bg_event 13, 13, BGEVENT_READ, OaksLabSign + bg_event 5, 11, BGEVENT_READ, BluesHouseSign -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_TEACHER, 8, 3, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PalletTownTeacherScript, -1 - person_event SPRITE_FISHER, 14, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PalletTownFisherScript, -1 + object_event SPRITE_TEACHER, 8, 3, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PalletTownTeacherScript, -1 + object_event SPRITE_FISHER, 14, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PalletTownFisherScript, -1 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 6ea37bbf9..04d5c0d8f 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -6,7 +6,7 @@ const_value set 2 const PEWTERCITY_FRUIT_TREE2 PewterCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -164,23 +164,23 @@ PewterCity_MapEventHeader: warp_def $19, $d, 1, PEWTER_POKECENTER_1F warp_def $1d, $7, 1, PEWTER_SNOOZE_SPEECH_HOUSE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 7 - signpost 23, 25, SIGNPOST_READ, PewterCitySign - signpost 17, 11, SIGNPOST_READ, PewterGymSign - signpost 9, 15, SIGNPOST_READ, PewterMuseumSign - signpost 19, 33, SIGNPOST_READ, PewterCityMtMoonGiftShopSign - signpost 29, 19, SIGNPOST_READ, PewterCityWelcomeSign - signpost 25, 14, SIGNPOST_READ, PewterCityPokecenterSign - signpost 17, 24, SIGNPOST_READ, PewterCityMartSign + bg_event 23, 25, BGEVENT_READ, PewterCitySign + bg_event 17, 11, BGEVENT_READ, PewterGymSign + bg_event 9, 15, BGEVENT_READ, PewterMuseumSign + bg_event 19, 33, BGEVENT_READ, PewterCityMtMoonGiftShopSign + bg_event 29, 19, BGEVENT_READ, PewterCityWelcomeSign + bg_event 25, 14, BGEVENT_READ, PewterCityPokecenterSign + bg_event 17, 24, BGEVENT_READ, PewterCityMartSign -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_COOLTRAINER_F, 11, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1 - person_event SPRITE_BUG_CATCHER, 29, 14, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1 - person_event SPRITE_GRAMPS, 17, 29, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1 - person_event SPRITE_FRUIT_TREE, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1 - person_event SPRITE_FRUIT_TREE, 3, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1 + object_event SPRITE_COOLTRAINER_F, 11, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1 + object_event SPRITE_BUG_CATCHER, 29, 14, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1 + object_event SPRITE_GRAMPS, 17, 29, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1 + object_event SPRITE_FRUIT_TREE, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1 + object_event SPRITE_FRUIT_TREE, 3, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 8fe9b726d..524113ba3 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -4,7 +4,7 @@ const_value set 2 const PEWTERGYM_GYM_GUY PewterGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -217,16 +217,16 @@ PewterGym_MapEventHeader: warp_def $d, $4, 2, PEWTER_CITY warp_def $d, $5, 2, PEWTER_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 11, 2, SIGNPOST_READ, PewterGymStatue - signpost 11, 7, SIGNPOST_READ, PewterGymStatue + bg_event 11, 2, BGEVENT_READ, PewterGymStatue + bg_event 11, 7, BGEVENT_READ, PewterGymStatue -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_BROCK, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1 - person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperJerry, -1 - person_event SPRITE_GYM_GUY, 11, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 1, PewterGymGuyScript, -1 + object_event SPRITE_BROCK, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1 + object_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1 + object_event SPRITE_GYM_GUY, 11, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1 diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index 9fb075ed9..be92c8cac 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -4,7 +4,7 @@ const_value set 2 const PEWTERMART_SUPER_NERD PewterMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -54,14 +54,14 @@ PewterMart_MapEventHeader: warp_def $7, $2, 3, PEWTER_CITY warp_def $7, $3, 3, PEWTER_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1 - person_event SPRITE_YOUNGSTER, 2, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1 - person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1 + object_event SPRITE_YOUNGSTER, 2, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1 + object_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 07650d3e6..410e3c365 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const PEWTERNIDORANSPEECHHOUSE_GROWLITHE PewterNidoranSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -37,13 +37,13 @@ PewterNidoranSpeechHouse_MapEventHeader: warp_def $7, $2, 1, PEWTER_CITY warp_def $7, $3, 1, PEWTER_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_SUPER_NERD, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PewterNidoranSpeechHouseSuperNerdScript, -1 - person_event SPRITE_GROWLITHE, 5, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PewterNidoran, -1 + object_event SPRITE_SUPER_NERD, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterNidoranSpeechHouseSuperNerdScript, -1 + object_event SPRITE_GROWLITHE, 5, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterNidoran, -1 diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index 2eb12d641..1ab45da18 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -6,7 +6,7 @@ const_value set 2 const PEWTERPOKECENTER1F_CHRIS PewterPokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -77,16 +77,16 @@ PewterPokecenter1F_MapEventHeader: warp_def $7, $4, 4, PEWTER_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1 - person_event SPRITE_TEACHER, 6, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1 - person_event SPRITE_JIGGLYPUFF, 3, 1, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PewterJigglypuff, -1 - person_event SPRITE_BUG_CATCHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PewterPokecenter1FBugCatcherScript, -1 - person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Chris, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1 + object_event SPRITE_TEACHER, 6, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1 + object_event SPRITE_JIGGLYPUFF, 3, 1, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterJigglypuff, -1 + object_event SPRITE_BUG_CATCHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FBugCatcherScript, -1 + object_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Chris, -1 diff --git a/maps/PewterPokecenter2FBeta.asm b/maps/PewterPokecenter2FBeta.asm index af81dfc4b..33c22b063 100644 --- a/maps/PewterPokecenter2FBeta.asm +++ b/maps/PewterPokecenter2FBeta.asm @@ -1,5 +1,5 @@ PewterPokecenter2FBeta_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -13,11 +13,11 @@ PewterPokecenter2FBeta_MapEventHeader: db 1 warp_def $7, $0, 3, PEWTER_POKECENTER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index b8a83262b..3b7c60f93 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const PEWTERSNOOZESPEECHHOUSE_GRAMPS PewterSnoozeSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -29,14 +29,14 @@ PewterSnoozeSpeechHouse_MapEventHeader: warp_def $7, $2, 5, PEWTER_CITY warp_def $7, $3, 5, PEWTER_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, PewterSnoozeSpeechHouseBookshelf - signpost 1, 1, SIGNPOST_READ, PewterSnoozeSpeechHouseBookshelf + bg_event 1, 0, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_GRAMPS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PewterSnoozeSpeechHouseGrampsScript, -1 + object_event SPRITE_GRAMPS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterSnoozeSpeechHouseGrampsScript, -1 diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index ad60c2d3e..0c79865aa 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const POKESEERSHOUSE_GRANNY PokeSeersHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -25,12 +25,12 @@ PokeSeersHouse_MapEventHeader: warp_def $7, $2, 7, CIANWOOD_CITY warp_def $7, $3, 7, CIANWOOD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SeerScript, -1 + object_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SeerScript, -1 diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 28f519a5f..ad4682cc5 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -5,46 +5,46 @@ const_value set 2 const POKECENTER2F_OFFICER Pokecenter2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 6 - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 - maptrigger .Trigger3 - maptrigger .Trigger4 - maptrigger .Trigger5 + scene_script .Scene0 + scene_script .Scene1 + scene_script .Scene2 + scene_script .Scene3 + scene_script .Scene4 + scene_script .Scene5 .MapCallbacks: db 0 -.Trigger0: +.Scene0: special Special_CheckMysteryGift - if_equal $0, .Trigger0Done + if_equal $0, .Scene0Done clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY checkevent EVENT_RECEIVED_BALLS_FROM_KURT - iftrue .Trigger0Done + iftrue .Scene0Done priorityjump Pokecenter2F_AppearMysteryGiftDeliveryGuy -.Trigger0Done: +.Scene0Done: end -.Trigger1: +.Scene1: priorityjump Script_LeftCableTradeCenter end -.Trigger2: +.Scene2: priorityjump Script_LeftCableColosseum end -.Trigger3: +.Scene3: priorityjump Script_LeftTimeCapsule end -.Trigger4: +.Scene4: priorityjump Script_LeftMobileTradeRoom end -.Trigger5: +.Scene5: priorityjump Script_LeftMobileBattleRoom end @@ -376,15 +376,15 @@ LinkReceptionistScript_TimeCapsule: Script_LeftCableTradeCenter: special WaitForOtherPlayerToExit scall Script_WalkOutOfLinkTradeRoom - dotrigger $0 - domaptrigger TRADE_CENTER, $0 + setscene $0 + setmapscene TRADE_CENTER, $0 end Script_LeftMobileTradeRoom: special Function101220 scall Script_WalkOutOfMobileTradeRoom - dotrigger $0 - domaptrigger MOBILE_TRADE_ROOM_MOBILE, $0 + setscene $0 + setmapscene MOBILE_TRADE_ROOM_MOBILE, $0 end Script_WalkOutOfMobileTradeRoom: @@ -396,15 +396,15 @@ Script_WalkOutOfMobileTradeRoom: Script_LeftCableColosseum: special WaitForOtherPlayerToExit scall Script_WalkOutOfLinkBattleRoom - dotrigger $0 - domaptrigger COLOSSEUM, $0 + setscene $0 + setmapscene COLOSSEUM, $0 end Script_LeftMobileBattleRoom: special Function101220 scall Script_WalkOutOfMobileBattleRoom - dotrigger $0 - domaptrigger MOBILE_BATTLE_ROOM, $0 + setscene $0 + setmapscene MOBILE_BATTLE_ROOM, $0 end Script_WalkOutOfMobileBattleRoom: @@ -546,7 +546,7 @@ TimeCapsuleScript_CheckPlayerGender: writebyte (PAL_NPC_RED << 4) special Special_SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown - faceperson PLAYER, POKECENTER2F_TIME_CAPSULE_RECEPTIONIST + faceobject PLAYER, POKECENTER2F_TIME_CAPSULE_RECEPTIONIST setflag ENGINE_KRIS_IN_CABLE_CLUB special ReplaceKrisSprite opentext @@ -579,8 +579,8 @@ Script_LeftTimeCapsule: applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2 .Done: - dotrigger $0 - domaptrigger TIME_CAPSULE, $0 + setscene $0 + setmapscene TIME_CAPSULE, $0 end MapPokecenter2FSignpost0Script: @@ -1035,16 +1035,16 @@ Pokecenter2F_MapEventHeader: warp_def $0, $6, 1, MOBILE_TRADE_ROOM_MOBILE warp_def $0, $a, 1, MOBILE_BATTLE_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 3, 7, SIGNPOST_READ, MapPokecenter2FSignpost0Script + bg_event 3, 7, BGEVENT_READ, MapPokecenter2FSignpost0Script -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_LINK_RECEPTIONIST, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1 - person_event SPRITE_LINK_RECEPTIONIST, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1 - person_event SPRITE_LINK_RECEPTIONIST, 3, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1 - person_event SPRITE_OFFICER, 1, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY + object_event SPRITE_LINK_RECEPTIONIST, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1 + object_event SPRITE_LINK_RECEPTIONIST, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1 + object_event SPRITE_LINK_RECEPTIONIST, 3, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1 + object_event SPRITE_OFFICER, 1, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 08ed2ade9..db04c88fd 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -7,7 +7,7 @@ const_value set 2 const POKEMONFANCLUB_ODDISH PokemonFanClub_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -305,19 +305,19 @@ PokemonFanClub_MapEventHeader: warp_def $7, $2, 3, VERMILION_CITY warp_def $7, $3, 3, VERMILION_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 7, SIGNPOST_READ, MapPokemonFanClubSignpost0Script - signpost 0, 9, SIGNPOST_READ, MapPokemonFanClubSignpost1Script + bg_event 0, 7, BGEVENT_READ, MapPokemonFanClubSignpost0Script + bg_event 0, 9, BGEVENT_READ, MapPokemonFanClubSignpost1Script -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_GENTLEMAN, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1 - person_event SPRITE_RECEPTIONIST, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1 - person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FisherScript_0x191824, -1 - person_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1 - person_event SPRITE_FAIRY, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClefairyDoll, EVENT_VERMILION_FAN_CLUB_DOLL - person_event SPRITE_ODDISH, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FanClubBayleef, -1 + object_event SPRITE_GENTLEMAN, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1 + object_event SPRITE_RECEPTIONIST, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1 + object_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FisherScript_0x191824, -1 + object_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1 + object_event SPRITE_FAIRY, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyDoll, EVENT_VERMILION_FAN_CLUB_DOLL + object_event SPRITE_ODDISH, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FanClubBayleef, -1 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 8c487a002..9445f4c97 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -8,18 +8,18 @@ const_value set 2 const POWERPLANT_FOREST PowerPlant_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end PowerPlantGuardPhoneScript: @@ -42,7 +42,7 @@ PowerPlantGuardPhoneScript: closetext spriteface PLAYER, DOWN applymovement POWERPLANT_OFFICER1, MovementData_0x188eda - dotrigger $0 + setscene $0 end OfficerScript_0x188df5: @@ -148,8 +148,8 @@ PowerPlantManager: setevent EVENT_MET_MANAGER_AT_POWER_PLANT clearevent EVENT_CERULEAN_GYM_ROCKET clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM - domaptrigger CERULEAN_GYM, $1 - dotrigger $1 + setmapscene CERULEAN_GYM, $1 + setscene $1 end UnknownScript_0x188e8d: @@ -397,21 +397,21 @@ PowerPlant_MapEventHeader: warp_def $11, $2, 2, ROUTE_10_NORTH warp_def $11, $3, 2, ROUTE_10_NORTH -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 1, $c, $5, PowerPlantGuardPhoneScript + coord_event 1, $c, $5, PowerPlantGuardPhoneScript -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, PowerPlantBookshelf - signpost 1, 1, SIGNPOST_READ, PowerPlantBookshelf + bg_event 1, 0, BGEVENT_READ, PowerPlantBookshelf + bg_event 1, 1, BGEVENT_READ, PowerPlantBookshelf -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_OFFICER, 14, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1 - person_event SPRITE_GYM_GUY, 9, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1 - person_event SPRITE_GYM_GUY, 11, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1 - person_event SPRITE_OFFICER, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x188e3d, -1 - person_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188e51, -1 - person_event SPRITE_FISHER, 10, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PowerPlantManager, -1 - person_event SPRITE_GYM_GUY, 5, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Forest, -1 + object_event SPRITE_OFFICER, 14, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1 + object_event SPRITE_GYM_GUY, 9, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1 + object_event SPRITE_GYM_GUY, 11, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1 + object_event SPRITE_OFFICER, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188e3d, -1 + object_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e51, -1 + object_event SPRITE_FISHER, 10, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PowerPlantManager, -1 + object_event SPRITE_GYM_GUY, 5, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Forest, -1 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 283663e69..56e1b0510 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -7,7 +7,7 @@ const_value set 2 const RADIOTOWER1F_COOLTRAINER_F RadioTower1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -482,19 +482,19 @@ RadioTower1F_MapEventHeader: warp_def $7, $3, 11, GOLDENROD_CITY warp_def $0, $f, 2, RADIO_TOWER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 3, SIGNPOST_READ, MapRadioTower1FSignpost0Script - signpost 0, 13, SIGNPOST_READ, MapRadioTower1FSignpost1Script + bg_event 0, 3, BGEVENT_READ, MapRadioTower1FSignpost0Script + bg_event 0, 13, BGEVENT_READ, MapRadioTower1FSignpost1Script -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_RECEPTIONIST, 6, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1 - person_event SPRITE_LASS, 4, 16, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_YOUNGSTER, 4, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_ROCKET, 1, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_COOLTRAINER_F, 6, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_RECEPTIONIST, 6, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1 + object_event SPRITE_LASS, 4, 16, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_YOUNGSTER, 4, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_ROCKET, 1, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_COOLTRAINER_F, 6, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 31093f073..bf267dc67 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -12,7 +12,7 @@ const_value set 2 const RADIOTOWER2F_RECEPTIONIST RadioTower2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -719,28 +719,28 @@ RadioTower2F_MapEventHeader: warp_def $0, $0, 1, RADIO_TOWER_3F warp_def $0, $f, 3, RADIO_TOWER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 0, 3, SIGNPOST_READ, MapRadioTower2FSignpost0Script - signpost 0, 5, SIGNPOST_READ, MapRadioTower2FSignpost1Script - signpost 1, 9, SIGNPOST_READ, RadioTower2FBookshelf - signpost 1, 10, SIGNPOST_READ, RadioTower2FBookshelf - signpost 1, 11, SIGNPOST_READ, RadioTower2FBookshelf - signpost 0, 13, SIGNPOST_READ, MapRadioTower2FSignpost5Script + bg_event 0, 3, BGEVENT_READ, MapRadioTower2FSignpost0Script + bg_event 0, 5, BGEVENT_READ, MapRadioTower2FSignpost1Script + bg_event 1, 9, BGEVENT_READ, RadioTower2FBookshelf + bg_event 1, 10, BGEVENT_READ, RadioTower2FBookshelf + bg_event 1, 11, BGEVENT_READ, RadioTower2FBookshelf + bg_event 0, 13, BGEVENT_READ, MapRadioTower2FSignpost5Script -.PersonEvents: +.ObjectEvents: db 11 - person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_TEACHER, 2, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1 - person_event SPRITE_ROCKET, 4, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 4, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET_GIRL, 5, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_BLACK_BELT, 1, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RadioTower2FBlackBelt1Script, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS - person_event SPRITE_BLACK_BELT, 1, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RadioTower2FBlackBelt2Script, EVENT_RADIO_TOWER_CIVILIANS_AFTER - person_event SPRITE_JIGGLYPUFF, 1, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1 - person_event SPRITE_BUENA, 5, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Buena, -1 - person_event SPRITE_RECEPTIONIST, 7, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_TEACHER, 2, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1 + object_event SPRITE_ROCKET, 4, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 4, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET_GIRL, 5, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_BLACK_BELT, 1, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt1Script, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS + object_event SPRITE_BLACK_BELT, 1, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt2Script, EVENT_RADIO_TOWER_CIVILIANS_AFTER + object_event SPRITE_JIGGLYPUFF, 1, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1 + object_event SPRITE_BUENA, 5, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Buena, -1 + object_event SPRITE_RECEPTIONIST, 7, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index ef15ce603..dc14a2912 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -8,7 +8,7 @@ const_value set 2 const RADIOTOWER3F_SCIENTIST RadioTower3F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -338,21 +338,21 @@ RadioTower3F_MapEventHeader: warp_def $0, $7, 2, RADIO_TOWER_4F warp_def $0, $11, 4, RADIO_TOWER_4F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 0, 3, SIGNPOST_READ, MapRadioTower3FSignpost0Script - signpost 0, 9, SIGNPOST_READ, MapRadioTower3FSignpost1Script - signpost 2, 14, SIGNPOST_UP, MapRadioTower3FSignpost2Script + bg_event 0, 3, BGEVENT_READ, MapRadioTower3FSignpost0Script + bg_event 0, 9, BGEVENT_READ, MapRadioTower3FSignpost1Script + bg_event 2, 14, BGEVENT_UP, MapRadioTower3FSignpost2Script -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_SUPER_NERD, 4, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER - person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1 - person_event SPRITE_COOLTRAINER_F, 3, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1 - person_event SPRITE_ROCKET, 1, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 6, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_SCIENTIST, 6, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_SUPER_NERD, 4, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER + object_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1 + object_event SPRITE_COOLTRAINER_F, 3, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1 + object_event SPRITE_ROCKET, 1, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 6, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_SCIENTIST, 6, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 38c802c85..4066bf75d 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -8,7 +8,7 @@ const_value set 2 const RADIOTOWER4F_SCIENTIST RadioTower4F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -256,20 +256,20 @@ RadioTower4F_MapEventHeader: warp_def $0, $c, 2, RADIO_TOWER_5F warp_def $0, $11, 3, RADIO_TOWER_3F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 7, SIGNPOST_READ, MapRadioTower4FSignpost0Script - signpost 0, 15, SIGNPOST_READ, MapRadioTower4FSignpost1Script + bg_event 0, 7, BGEVENT_READ, MapRadioTower4FSignpost0Script + bg_event 0, 15, BGEVENT_READ, MapRadioTower4FSignpost1Script -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_FISHER, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER - person_event SPRITE_TEACHER, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1 - person_event SPRITE_GROWLITHE, 7, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, RadioTowerMeowth, -1 - person_event SPRITE_ROCKET, 6, 5, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 1, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET_GIRL, 4, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_SCIENTIST, 2, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_FISHER, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER + object_event SPRITE_TEACHER, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1 + object_event SPRITE_GROWLITHE, 7, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTowerMeowth, -1 + object_event SPRITE_ROCKET, 6, 5, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 1, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET_GIRL, 4, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_SCIENTIST, 2, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 020569db2..e09b280e1 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -6,22 +6,22 @@ const_value set 2 const RADIOTOWER5F_POKE_BALL RadioTower5F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 3 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 - maptrigger .DummyTrigger2 + scene_script .DummyScene0 + scene_script .DummyScene1 + scene_script .DummyScene2 .MapCallbacks: db 0 -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end -.DummyTrigger2: +.DummyScene2: end FakeDirectorScript: @@ -47,7 +47,7 @@ FakeDirectorScript: buttonsound verbosegiveitem BASEMENT_KEY closetext - dotrigger $1 + setscene $1 setevent EVENT_BEAT_ROCKET_EXECUTIVEM_3 end @@ -78,7 +78,7 @@ TrainerExecutivef1: closetext end -RadioTower5FRocketBossTrigger: +RadioTower5FRocketBossScene: applymovement PLAYER, MovementData_0x60125 playmusic MUSIC_ROCKET_ENCOUNTER spriteface RADIOTOWER5F_ROCKET, RIGHT @@ -115,7 +115,7 @@ RadioTower5FRocketBossTrigger: clearevent EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM special PlayMapMusic disappear RADIOTOWER5F_DIRECTOR - moveperson RADIOTOWER5F_DIRECTOR, $c, $0 + moveobject RADIOTOWER5F_DIRECTOR, $c, $0 appear RADIOTOWER5F_DIRECTOR applymovement RADIOTOWER5F_DIRECTOR, RadioTower5FDirectorWalksIn spriteface PLAYER, RIGHT @@ -126,8 +126,8 @@ RadioTower5FRocketBossTrigger: writetext RadioTower5FDirectorDescribeClearBellText waitbutton closetext - dotrigger $2 - domaptrigger ECRUTEAK_HOUSE, $0 + setscene $2 + setmapscene ECRUTEAK_HOUSE, $0 setevent EVENT_GOT_CLEAR_BELL setevent EVENT_TEAM_ROCKET_DISBANDED jump .UselessJump @@ -429,23 +429,23 @@ RadioTower5F_MapEventHeader: warp_def $0, $0, 1, RADIO_TOWER_4F warp_def $0, $c, 3, RADIO_TOWER_4F -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $3, $0, FakeDirectorScript - xy_trigger 1, $5, $10, RadioTower5FRocketBossTrigger + coord_event 0, $3, $0, FakeDirectorScript + coord_event 1, $5, $10, RadioTower5FRocketBossScene -.Signposts: +.BGEvents: db 5 - signpost 0, 3, SIGNPOST_READ, MapRadioTower5FSignpost0Script - signpost 0, 11, SIGNPOST_READ, MapRadioTower5FSignpost2Script - signpost 0, 15, SIGNPOST_READ, MapRadioTower5FSignpost2Script - signpost 1, 16, SIGNPOST_READ, RadioTower5FBookshelf - signpost 1, 17, SIGNPOST_READ, RadioTower5FBookshelf + bg_event 0, 3, BGEVENT_READ, MapRadioTower5FSignpost0Script + bg_event 0, 11, BGEVENT_READ, MapRadioTower5FSignpost2Script + bg_event 0, 15, BGEVENT_READ, MapRadioTower5FSignpost2Script + bg_event 1, 16, BGEVENT_READ, RadioTower5FBookshelf + bg_event 1, 17, BGEVENT_READ, RadioTower5FBookshelf -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_GENTLEMAN, 6, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Director, -1 - person_event SPRITE_ROCKET, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET_GIRL, 2, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKER, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER - person_event SPRITE_POKE_BALL, 5, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RadioTower5FUltraBall, EVENT_RADIO_TOWER_5F_ULTRA_BALL + object_event SPRITE_GENTLEMAN, 6, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Director, -1 + object_event SPRITE_ROCKET, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET_GIRL, 2, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKER, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER + object_event SPRITE_POKE_BALL, 5, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RadioTower5FUltraBall, EVENT_RADIO_TOWER_5F_ULTRA_BALL diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index cf7dd4b3b..9d7408386 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -2,14 +2,14 @@ const_value set 2 const REDSHOUSE1F_REDS_MOM RedsHouse1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - maptrigger .DummyTrigger + scene_script .DummyScene .MapCallbacks: db 0 -.DummyTrigger: +.DummyScene: end RedsMom: @@ -84,15 +84,15 @@ RedsHouse1F_MapEventHeader: warp_def $7, $3, 1, PALLET_TOWN warp_def $0, $7, 1, REDS_HOUSE_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 1, 0, SIGNPOST_READ, RedsHouse1FBookshelf - signpost 1, 1, SIGNPOST_READ, RedsHouse1FBookshelf - signpost 1, 2, SIGNPOST_READ, RedsHouse1FTV + bg_event 1, 0, BGEVENT_READ, RedsHouse1FBookshelf + bg_event 1, 1, BGEVENT_READ, RedsHouse1FBookshelf + bg_event 1, 2, BGEVENT_READ, RedsHouse1FTV -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_REDS_MOM, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RedsMom, -1 + object_event SPRITE_REDS_MOM, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RedsMom, -1 diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index 5934f2cf4..6919b7fe0 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -1,5 +1,5 @@ RedsHouse2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -33,13 +33,13 @@ RedsHouse2F_MapEventHeader: db 1 warp_def $0, $7, 3, REDS_HOUSE_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 5, 3, SIGNPOST_READ, RedsHouse2FN64Script - signpost 1, 0, SIGNPOST_READ, RedsHouse2FPCScript + bg_event 5, 3, BGEVENT_READ, RedsHouse2FN64Script + bg_event 1, 0, BGEVENT_READ, RedsHouse2FPCScript -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 1fa6ef971..32b274ca5 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -3,7 +3,7 @@ const_value set 2 const ROCKTUNNEL1F_POKE_BALL2 RockTunnel1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -36,15 +36,15 @@ RockTunnel1F_MapEventHeader: warp_def $3, $1b, 4, ROCK_TUNNEL_B1F warp_def $d, $1b, 1, ROCK_TUNNEL_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 4, 24, SIGNPOST_ITEM, RockTunnel1FHiddenXAccuracy - signpost 15, 21, SIGNPOST_ITEM, RockTunnel1FHiddenXDefend + bg_event 4, 24, BGEVENT_ITEM, RockTunnel1FHiddenXAccuracy + bg_event 15, 21, BGEVENT_ITEM, RockTunnel1FHiddenXDefend -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKE_BALL, 18, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER - person_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING + object_event SPRITE_POKE_BALL, 18, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER + object_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 391083470..e4b820d5d 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -4,7 +4,7 @@ const_value set 2 const ROCKTUNNELB1F_POKE_BALL3 RockTunnelB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -34,15 +34,15 @@ RockTunnelB1F_MapEventHeader: warp_def $3, $17, 3, ROCK_TUNNEL_1F warp_def $17, $19, 5, ROCK_TUNNEL_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 14, 4, SIGNPOST_ITEM, RockTunnelB1FHiddenMaxPotion + bg_event 14, 4, BGEVENT_ITEM, RockTunnelB1FHiddenMaxPotion -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON - person_event SPRITE_POKE_BALL, 17, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP - person_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE + object_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON + object_event SPRITE_POKE_BALL, 17, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP + object_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE diff --git a/maps/Route1.asm b/maps/Route1.asm index d083b2708..0f898163c 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE1_FRUIT_TREE Route1_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -87,15 +87,15 @@ Route1_MapEventHeader: .Warps: db 0 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 27, 7, SIGNPOST_READ, Route1Sign + bg_event 27, 7, BGEVENT_READ, Route1Sign -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_YOUNGSTER, 12, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1 - person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1 - person_event SPRITE_FRUIT_TREE, 7, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1 + object_event SPRITE_YOUNGSTER, 12, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1 + object_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1 + object_event SPRITE_FRUIT_TREE, 7, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1 diff --git a/maps/Route10North.asm b/maps/Route10North.asm index 97094ff05..48aaa4bdc 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -1,5 +1,5 @@ Route10North_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -24,13 +24,13 @@ Route10North_MapEventHeader: warp_def $1, $b, 1, ROUTE_10_POKECENTER_1F warp_def $9, $3, 1, POWER_PLANT -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 11, 5, SIGNPOST_READ, PowerPlantSign - signpost 1, 12, SIGNPOST_READ, Route10PokecenterSign + bg_event 11, 5, BGEVENT_READ, PowerPlantSign + bg_event 1, 12, BGEVENT_READ, Route10PokecenterSign -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index 7fa695d0f..09474c902 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const ROUTE10POKECENTER1F_COOLTRAINER_F Route10Pokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -90,15 +90,15 @@ Route10Pokecenter1F_MapEventHeader: warp_def $7, $4, 1, ROUTE_10_NORTH warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1 - person_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1 - person_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1 - person_event SPRITE_COOLTRAINER_F, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1 + object_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1 + object_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1 + object_event SPRITE_COOLTRAINER_F, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1 diff --git a/maps/Route10Pokecenter2FBeta.asm b/maps/Route10Pokecenter2FBeta.asm index f3c247241..047e42c78 100644 --- a/maps/Route10Pokecenter2FBeta.asm +++ b/maps/Route10Pokecenter2FBeta.asm @@ -1,5 +1,5 @@ Route10Pokecenter2FBeta_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -13,11 +13,11 @@ Route10Pokecenter2FBeta_MapEventHeader: db 1 warp_def $7, $0, 3, ROUTE_10_POKECENTER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 2c9a6fd7f..ac8c56357 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE10SOUTH_POKEFAN_M2 Route10South_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -83,14 +83,14 @@ Route10South_MapEventHeader: db 1 warp_def $1, $6, 2, ROCK_TUNNEL_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 3, 5, SIGNPOST_READ, Route10Sign + bg_event 3, 5, BGEVENT_READ, Route10Sign -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKEFAN_M, 3, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerJim, -1 - person_event SPRITE_POKEFAN_M, 10, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmRobert, -1 + object_event SPRITE_POKEFAN_M, 3, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerJim, -1 + object_event SPRITE_POKEFAN_M, 10, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmRobert, -1 diff --git a/maps/Route11.asm b/maps/Route11.asm index c01fefdb8..9aa324439 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -6,7 +6,7 @@ const_value set 2 const ROUTE11_FRUIT_TREE Route11_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -153,18 +153,18 @@ Route11_MapEventHeader: .Warps: db 0 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 7, 3, SIGNPOST_READ, Route11Sign - signpost 5, 32, SIGNPOST_ITEM, Route11HiddenRevive + bg_event 7, 3, BGEVENT_READ, Route11Sign + bg_event 5, 32, BGEVENT_ITEM, Route11HiddenRevive -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_YOUNGSTER, 14, 22, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterOwen, -1 - person_event SPRITE_YOUNGSTER, 4, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterJason, -1 - person_event SPRITE_YOUNGSTER, 7, 28, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerPsychicHerman, -1 - person_event SPRITE_YOUNGSTER, 6, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicFidel, -1 - person_event SPRITE_FRUIT_TREE, 2, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1 + object_event SPRITE_YOUNGSTER, 14, 22, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterOwen, -1 + object_event SPRITE_YOUNGSTER, 4, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1 + object_event SPRITE_YOUNGSTER, 7, 28, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1 + object_event SPRITE_YOUNGSTER, 6, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFidel, -1 + object_event SPRITE_FRUIT_TREE, 2, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1 diff --git a/maps/Route12.asm b/maps/Route12.asm index ea867c641..3d55a2852 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -7,7 +7,7 @@ const_value set 2 const ROUTE12_POKE_BALL2 Route12_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -175,20 +175,20 @@ Route12_MapEventHeader: db 1 warp_def $21, $b, 1, ROUTE_12_SUPER_ROD_HOUSE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 27, 11, SIGNPOST_READ, Route12Sign - signpost 9, 13, SIGNPOST_READ, FishingSpotSign - signpost 13, 14, SIGNPOST_ITEM, Route12HiddenElixer + bg_event 27, 11, BGEVENT_READ, Route12Sign + bg_event 9, 13, BGEVENT_READ, FishingSpotSign + bg_event 13, 14, BGEVENT_ITEM, Route12HiddenElixer -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_FISHER, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherMartin, -1 - person_event SPRITE_FISHER, 23, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherStephen, -1 - person_event SPRITE_FISHER, 38, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 5, TrainerFisherBarney, -1 - person_event SPRITE_FISHER, 7, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherKyle, -1 - person_event SPRITE_POKE_BALL, 43, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM - person_event SPRITE_POKE_BALL, 51, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET + object_event SPRITE_FISHER, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherMartin, -1 + object_event SPRITE_FISHER, 23, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherStephen, -1 + object_event SPRITE_FISHER, 38, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerFisherBarney, -1 + object_event SPRITE_FISHER, 7, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherKyle, -1 + object_event SPRITE_POKE_BALL, 43, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM + object_event SPRITE_POKE_BALL, 51, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index c14324c06..a349641e0 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE12SUPERRODHOUSE_FISHING_GURU Route12SuperRodHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -88,12 +88,12 @@ Route12SuperRodHouse_MapEventHeader: warp_def $7, $2, 1, ROUTE_12 warp_def $7, $3, 1, ROUTE_12 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1 + object_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1 diff --git a/maps/Route13.asm b/maps/Route13.asm index 03490891b..7ea3738fd 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -6,7 +6,7 @@ const_value set 2 const ROUTE13_POKEFAN_M3 Route13_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -199,20 +199,20 @@ Route13_MapEventHeader: .Warps: db 0 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 13, 29, SIGNPOST_READ, Route13TrainerTips - signpost 11, 41, SIGNPOST_READ, Route13Sign - signpost 13, 17, SIGNPOST_READ, Route13DirectionsSign - signpost 13, 30, SIGNPOST_ITEM, Route13HiddenCalcium + bg_event 13, 29, BGEVENT_READ, Route13TrainerTips + bg_event 11, 41, BGEVENT_READ, Route13Sign + bg_event 13, 17, BGEVENT_READ, Route13DirectionsSign + bg_event 13, 30, BGEVENT_ITEM, Route13HiddenCalcium -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_YOUNGSTER, 6, 42, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerBird_keeperPerry, -1 - person_event SPRITE_YOUNGSTER, 6, 43, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerBird_keeperBret, -1 - person_event SPRITE_POKEFAN_M, 8, 32, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1 - person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerHikerKenny, -1 - person_event SPRITE_POKEFAN_M, 6, 25, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerPokefanmAlex, -1 + object_event SPRITE_YOUNGSTER, 6, 42, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBird_keeperPerry, -1 + object_event SPRITE_YOUNGSTER, 6, 43, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBird_keeperBret, -1 + object_event SPRITE_POKEFAN_M, 8, 32, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1 + object_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerHikerKenny, -1 + object_event SPRITE_POKEFAN_M, 6, 25, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmAlex, -1 diff --git a/maps/Route14.asm b/maps/Route14.asm index e7a3c7f3f..ba9a510af 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -5,7 +5,7 @@ const_value set 2 const ROUTE14_KIM Route14_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -122,15 +122,15 @@ Route14_MapEventHeader: .Warps: db 0 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_POKEFAN_M, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmCarter, -1 - person_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperRoy, -1 - person_event SPRITE_POKEFAN_M, 11, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1 - person_event SPRITE_TEACHER, 5, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 4, Kim, -1 + object_event SPRITE_POKEFAN_M, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmCarter, -1 + object_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperRoy, -1 + object_event SPRITE_POKEFAN_M, 11, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1 + object_event SPRITE_TEACHER, 5, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 4, Kim, -1 diff --git a/maps/Route15.asm b/maps/Route15.asm index 317c536fb..8eb5bbb84 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -8,7 +8,7 @@ const_value set 2 const ROUTE15_POKE_BALL Route15_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -210,19 +210,19 @@ Route15_MapEventHeader: warp_def $4, $2, 3, ROUTE_15_FUCHSIA_GATE warp_def $5, $2, 4, ROUTE_15_FUCHSIA_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 9, 19, SIGNPOST_READ, Route15Sign + bg_event 9, 19, BGEVENT_READ, Route15Sign -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_YOUNGSTER, 10, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerSchoolboyKipp, -1 - person_event SPRITE_YOUNGSTER, 13, 15, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyTommy, -1 - person_event SPRITE_YOUNGSTER, 10, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyJohnny, -1 - person_event SPRITE_YOUNGSTER, 10, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyBilly, -1 - person_event SPRITE_TEACHER, 12, 30, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerTeacherColette, -1 - person_event SPRITE_TEACHER, 10, 20, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerTeacherHillary, -1 - person_event SPRITE_POKE_BALL, 5, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP + object_event SPRITE_YOUNGSTER, 10, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyKipp, -1 + object_event SPRITE_YOUNGSTER, 13, 15, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyTommy, -1 + object_event SPRITE_YOUNGSTER, 10, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJohnny, -1 + object_event SPRITE_YOUNGSTER, 10, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyBilly, -1 + object_event SPRITE_TEACHER, 12, 30, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerTeacherColette, -1 + object_event SPRITE_TEACHER, 10, 20, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherHillary, -1 + object_event SPRITE_POKE_BALL, 5, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 855986895..f78fab3ae 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE15FUCHSIAGATE_OFFICER Route15FuchsiaGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -30,12 +30,12 @@ Route15FuchsiaGate_MapEventHeader: warp_def $4, $9, 1, ROUTE_15 warp_def $5, $9, 2, ROUTE_15 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1 diff --git a/maps/Route16.asm b/maps/Route16.asm index 7c63d184b..abbd7d7e2 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -1,5 +1,5 @@ Route16_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -40,12 +40,12 @@ Route16_MapEventHeader: warp_def $6, $9, 1, ROUTE_16_GATE warp_def $7, $9, 2, ROUTE_16_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 5, 5, SIGNPOST_READ, CyclingRoadSign + bg_event 5, 5, BGEVENT_READ, CyclingRoadSign -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 26f47f14a..4b3164b23 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD Route16FuchsiaSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -31,14 +31,14 @@ Route16FuchsiaSpeechHouse_MapEventHeader: warp_def $7, $2, 1, ROUTE_16 warp_def $7, $3, 1, ROUTE_16 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, Route16FuchsiaSpeechHouseBookshelf - signpost 1, 1, SIGNPOST_READ, Route16FuchsiaSpeechHouseBookshelf + bg_event 1, 0, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1 + object_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index d8bfdc0d3..3ce10b391 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -2,14 +2,14 @@ const_value set 2 const ROUTE16GATE_OFFICER Route16Gate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - maptrigger .DummyTrigger + scene_script .DummyScene .MapCallbacks: db 0 -.DummyTrigger: +.DummyScene: end Route16GateOfficerScript: @@ -71,14 +71,14 @@ Route16Gate_MapEventHeader: warp_def $4, $9, 2, ROUTE_16 warp_def $5, $9, 3, ROUTE_16 -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $4, $5, UnknownScript_0x733ed - xy_trigger 0, $5, $5, UnknownScript_0x733ed + coord_event 0, $4, $5, UnknownScript_0x733ed + coord_event 0, $5, $5, UnknownScript_0x733ed -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route16GateOfficerScript, -1 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1 diff --git a/maps/Route17.asm b/maps/Route17.asm index 89043b890..147e5238c 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -5,7 +5,7 @@ const_value set 2 const ROUTE17_BIKER4 Route17_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -143,17 +143,17 @@ Route17_MapEventHeader: warp_def $52, $11, 1, ROUTE_17_18_GATE warp_def $53, $11, 2, ROUTE_17_18_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 54, 9, SIGNPOST_ITEM, Route17HiddenMaxEther - signpost 77, 8, SIGNPOST_ITEM, Route17HiddenMaxElixer + bg_event 54, 9, BGEVENT_ITEM, Route17HiddenMaxEther + bg_event 77, 8, BGEVENT_ITEM, Route17HiddenMaxElixer -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_BIKER, 17, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 4, TrainerBikerRiley, -1 - person_event SPRITE_BIKER, 68, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 1, TrainerBikerJoel, -1 - person_event SPRITE_BIKER, 53, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBikerGlenn, -1 - person_event SPRITE_BIKER, 80, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 4, TrainerBikerCharles, -1 + object_event SPRITE_BIKER, 17, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerRiley, -1 + object_event SPRITE_BIKER, 68, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBikerJoel, -1 + object_event SPRITE_BIKER, 53, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBikerGlenn, -1 + object_event SPRITE_BIKER, 80, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerCharles, -1 diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index c87d389aa..610362396 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -2,14 +2,14 @@ const_value set 2 const ROUTE1718GATE_OFFICER Route1718Gate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - maptrigger .DummyTrigger + scene_script .DummyScene .MapCallbacks: db 0 -.DummyTrigger: +.DummyScene: end Route1718GateOfficerScript: @@ -62,14 +62,14 @@ Route1718Gate_MapEventHeader: warp_def $4, $9, 1, ROUTE_18 warp_def $5, $9, 2, ROUTE_18 -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $4, $5, UnknownScript_0x73611 - xy_trigger 0, $5, $5, UnknownScript_0x73611 + coord_event 0, $4, $5, UnknownScript_0x73611 + coord_event 0, $5, $5, UnknownScript_0x73611 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route1718GateOfficerScript, -1 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route1718GateOfficerScript, -1 diff --git a/maps/Route18.asm b/maps/Route18.asm index 16f5c6920..aaa2ce6cf 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE18_YOUNGSTER2 Route18_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -86,14 +86,14 @@ Route18_MapEventHeader: warp_def $6, $2, 3, ROUTE_17_18_GATE warp_def $7, $2, 4, ROUTE_17_18_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 5, 9, SIGNPOST_READ, Route18Sign + bg_event 5, 9, BGEVENT_READ, Route18Sign -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_YOUNGSTER, 12, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperBoris, -1 - person_event SPRITE_YOUNGSTER, 6, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperBob, -1 + object_event SPRITE_YOUNGSTER, 12, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperBoris, -1 + object_event SPRITE_YOUNGSTER, 6, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperBob, -1 diff --git a/maps/Route19.asm b/maps/Route19.asm index 02e59165f..e0e62a5b8 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -7,7 +7,7 @@ const_value set 2 const ROUTE19_FISHER2 Route19_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -242,19 +242,19 @@ Route19_MapEventHeader: db 1 warp_def $3, $7, 3, ROUTE_19___FUCHSIA_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 13, 11, SIGNPOST_READ, Route19Sign - signpost 1, 11, SIGNPOST_READ, CarefulSwimmingSign + bg_event 13, 11, BGEVENT_READ, Route19Sign + bg_event 1, 11, BGEVENT_READ, CarefulSwimmingSign -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_SWIMMER_GIRL, 23, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1 - person_event SPRITE_SWIMMER_GUY, 28, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermHarold, -1 - person_event SPRITE_SWIMMER_GUY, 17, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermJerome, -1 - person_event SPRITE_SWIMMER_GUY, 23, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 0, TrainerSwimmermTucker, -1 - person_event SPRITE_FISHER, 5, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 1, FisherScript_0x19ea4d, -1 - person_event SPRITE_FISHER, 5, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 1, FisherScript_0x19ea61, -1 + object_event SPRITE_SWIMMER_GIRL, 23, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1 + object_event SPRITE_SWIMMER_GUY, 28, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermHarold, -1 + object_event SPRITE_SWIMMER_GUY, 17, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermJerome, -1 + object_event SPRITE_SWIMMER_GUY, 23, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerSwimmermTucker, -1 + object_event SPRITE_FISHER, 5, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea4d, -1 + object_event SPRITE_FISHER, 5, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea61, -1 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index d8321cef9..5bbf83c8c 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE19FUCHSIAGATE_OFFICER Route19FuchsiaGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -56,12 +56,12 @@ Route19FuchsiaGate_MapEventHeader: warp_def $7, $4, 1, ROUTE_19 warp_def $7, $5, 1, ROUTE_19 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1 + object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1 diff --git a/maps/Route2.asm b/maps/Route2.asm index d33381b26..80f703b16 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -9,7 +9,7 @@ const_value set 2 const ROUTE2_FRUIT_TREE Route2_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -158,25 +158,25 @@ Route2_MapEventHeader: warp_def $1b, $11, 2, ROUTE_2_GATE warp_def $7, $c, 3, DIGLETTS_CAVE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 51, 7, SIGNPOST_READ, Route2Sign - signpost 9, 11, SIGNPOST_READ, MapRoute2Signpost1Script - signpost 23, 7, SIGNPOST_ITEM, Route2HiddenMaxEther - signpost 14, 4, SIGNPOST_ITEM, Route2HiddenFullHeal - signpost 27, 4, SIGNPOST_ITEM, Route2HiddenFullRestore - signpost 30, 11, SIGNPOST_ITEM, Route2HiddenRevive + bg_event 51, 7, BGEVENT_READ, Route2Sign + bg_event 9, 11, BGEVENT_READ, MapRoute2Signpost1Script + bg_event 23, 7, BGEVENT_ITEM, Route2HiddenMaxEther + bg_event 14, 4, BGEVENT_ITEM, Route2HiddenFullHeal + bg_event 27, 4, BGEVENT_ITEM, Route2HiddenFullRestore + bg_event 30, 11, BGEVENT_ITEM, Route2HiddenRevive -.PersonEvents: +.ObjectEvents: db 8 - person_event SPRITE_BUG_CATCHER, 45, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 5, TrainerBug_catcherRob, -1 - person_event SPRITE_BUG_CATCHER, 4, 6, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherEd, -1 - person_event SPRITE_BUG_CATCHER, 40, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherDoug, -1 - person_event SPRITE_POKE_BALL, 29, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT - person_event SPRITE_POKE_BALL, 23, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION - person_event SPRITE_POKE_BALL, 2, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS - person_event SPRITE_POKE_BALL, 50, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER - person_event SPRITE_FRUIT_TREE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1 + object_event SPRITE_BUG_CATCHER, 45, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBug_catcherRob, -1 + object_event SPRITE_BUG_CATCHER, 4, 6, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherEd, -1 + object_event SPRITE_BUG_CATCHER, 40, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherDoug, -1 + object_event SPRITE_POKE_BALL, 29, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT + object_event SPRITE_POKE_BALL, 23, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION + object_event SPRITE_POKE_BALL, 2, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS + object_event SPRITE_POKE_BALL, 50, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER + object_event SPRITE_FRUIT_TREE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1 diff --git a/maps/Route20.asm b/maps/Route20.asm index c0a05f7a4..1bdac9b3c 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE20_SWIMMER_GUY Route20_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -120,15 +120,15 @@ Route20_MapEventHeader: db 1 warp_def $7, $26, 1, SEAFOAM_GYM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 11, 37, SIGNPOST_READ, CinnabarGymSign + bg_event 11, 37, BGEVENT_READ, CinnabarGymSign -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_SWIMMER_GIRL, 8, 52, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1 - person_event SPRITE_SWIMMER_GIRL, 13, 45, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfLori, -1 - person_event SPRITE_SWIMMER_GUY, 13, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermCameron, -1 + object_event SPRITE_SWIMMER_GIRL, 8, 52, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1 + object_event SPRITE_SWIMMER_GIRL, 13, 45, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfLori, -1 + object_event SPRITE_SWIMMER_GUY, 13, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCameron, -1 diff --git a/maps/Route21.asm b/maps/Route21.asm index 64bc65257..b68c3c27b 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE21_FISHER Route21_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -96,14 +96,14 @@ Route21_MapEventHeader: .Warps: db 0 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_SWIMMER_GIRL, 16, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfNikki, -1 - person_event SPRITE_SWIMMER_GUY, 30, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerSwimmermSeth, -1 - person_event SPRITE_FISHER, 22, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherArnold, -1 + object_event SPRITE_SWIMMER_GIRL, 16, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNikki, -1 + object_event SPRITE_SWIMMER_GUY, 30, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSeth, -1 + object_event SPRITE_FISHER, 22, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherArnold, -1 diff --git a/maps/Route22.asm b/maps/Route22.asm index 9735a09e1..8e349ec34 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -1,5 +1,5 @@ Route22_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -23,12 +23,12 @@ Route22_MapEventHeader: db 1 warp_def $5, $d, 1, VICTORY_ROAD_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 7, 15, SIGNPOST_READ, VictoryRoadEntranceSign + bg_event 7, 15, BGEVENT_READ, VictoryRoadEntranceSign -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/Route23.asm b/maps/Route23.asm index 83b114ab7..1c0e2aa8e 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -1,5 +1,5 @@ Route23_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -33,12 +33,12 @@ Route23_MapEventHeader: warp_def $d, $9, 10, VICTORY_ROAD warp_def $d, $a, 10, VICTORY_ROAD -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 7, 11, SIGNPOST_READ, IndigoPlateauSign + bg_event 7, 11, BGEVENT_READ, IndigoPlateauSign -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/Route24.asm b/maps/Route24.asm index 365d347e5..5a98bb650 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE24_ROCKET Route24_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -125,12 +125,12 @@ Route24_MapEventHeader: .Warps: db 0 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_ROCKET, 7, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET + object_event SPRITE_ROCKET, 7, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET diff --git a/maps/Route25.asm b/maps/Route25.asm index 44e854532..ca6576771 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -12,18 +12,18 @@ const_value set 2 const ROUTE25_POKE_BALL Route25_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end UnknownScript_0x19eea0: @@ -48,7 +48,7 @@ UnknownScript_0x19eea0: applymovement ROUTE25_MISTY, MovementData_0x19f000 disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM - dotrigger $0 + setscene $0 special RestartMapMusic end @@ -74,7 +74,7 @@ UnknownScript_0x19eee0: applymovement ROUTE25_MISTY, MovementData_0x19f000 disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM - dotrigger $0 + setscene $0 special RestartMapMusic end @@ -438,26 +438,26 @@ Route25_MapEventHeader: db 1 warp_def $5, $2f, 1, BILLS_HOUSE -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 1, $6, $2a, UnknownScript_0x19eea0 - xy_trigger 1, $7, $2a, UnknownScript_0x19eee0 + coord_event 1, $6, $2a, UnknownScript_0x19eea0 + coord_event 1, $7, $2a, UnknownScript_0x19eee0 -.Signposts: +.BGEvents: db 2 - signpost 5, 45, SIGNPOST_READ, BillsHouseSign - signpost 5, 4, SIGNPOST_ITEM, Route25HiddenPotion + bg_event 5, 45, BGEVENT_READ, BillsHouseSign + bg_event 5, 4, BGEVENT_ITEM, Route25HiddenPotion -.PersonEvents: +.ObjectEvents: db 11 - person_event SPRITE_MISTY, 9, 46, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND - person_event SPRITE_COOLTRAINER_M, 10, 46, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND - person_event SPRITE_YOUNGSTER, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1 - person_event SPRITE_LASS, 11, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerLassEllen, -1 - person_event SPRITE_YOUNGSTER, 8, 21, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerSchoolboyJoe, -1 - person_event SPRITE_LASS, 6, 22, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerLassLaura, -1 - person_event SPRITE_YOUNGSTER, 4, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerCamperLloyd, -1 - person_event SPRITE_LASS, 11, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerLassShannon, -1 - person_event SPRITE_SUPER_NERD, 7, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 1, TrainerSupernerdPat, -1 - person_event SPRITE_COOLTRAINER_M, 8, 37, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19efac, -1 - person_event SPRITE_POKE_BALL, 4, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN + object_event SPRITE_MISTY, 9, 46, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND + object_event SPRITE_COOLTRAINER_M, 10, 46, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND + object_event SPRITE_YOUNGSTER, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1 + object_event SPRITE_LASS, 11, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassEllen, -1 + object_event SPRITE_YOUNGSTER, 8, 21, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyJoe, -1 + object_event SPRITE_LASS, 6, 22, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassLaura, -1 + object_event SPRITE_YOUNGSTER, 4, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperLloyd, -1 + object_event SPRITE_LASS, 11, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassShannon, -1 + object_event SPRITE_SUPER_NERD, 7, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerSupernerdPat, -1 + object_event SPRITE_COOLTRAINER_M, 8, 37, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19efac, -1 + object_event SPRITE_POKE_BALL, 4, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN diff --git a/maps/Route26.asm b/maps/Route26.asm index f48f2b082..91fcc9fab 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -9,7 +9,7 @@ const_value set 2 const ROUTE26_POKE_BALL Route26_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -422,20 +422,20 @@ Route26_MapEventHeader: warp_def $39, $f, 1, ROUTE_26_HEAL_SPEECH_HOUSE warp_def $47, $5, 1, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 6, 8, SIGNPOST_READ, Route26Sign + bg_event 6, 8, BGEVENT_READ, Route26Sign -.PersonEvents: +.ObjectEvents: db 8 - person_event SPRITE_COOLTRAINER_M, 24, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainermJake, -1 - person_event SPRITE_COOLTRAINER_M, 38, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1 - person_event SPRITE_COOLTRAINER_F, 56, 10, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfJoyce, -1 - person_event SPRITE_COOLTRAINER_F, 8, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerCooltrainerfBeth1, -1 - person_event SPRITE_YOUNGSTER, 79, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerPsychicRichard, -1 - person_event SPRITE_FISHER, 92, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherScott, -1 - person_event SPRITE_FRUIT_TREE, 54, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a4ec2, -1 - person_event SPRITE_POKE_BALL, 15, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER + object_event SPRITE_COOLTRAINER_M, 24, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermJake, -1 + object_event SPRITE_COOLTRAINER_M, 38, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1 + object_event SPRITE_COOLTRAINER_F, 56, 10, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJoyce, -1 + object_event SPRITE_COOLTRAINER_F, 8, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfBeth1, -1 + object_event SPRITE_YOUNGSTER, 79, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicRichard, -1 + object_event SPRITE_FISHER, 92, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherScott, -1 + object_event SPRITE_FRUIT_TREE, 54, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a4ec2, -1 + object_event SPRITE_POKE_BALL, 15, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm index 6463ba89e..da946711d 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/Route26DayofWeekSiblingsHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE26DAYOFWEEKSIBLINGSHOUSE_POKEDEX Route26DayofWeekSiblingsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -79,12 +79,12 @@ Route26DayofWeekSiblingsHouse_MapEventHeader: warp_def $7, $2, 3, ROUTE_26 warp_def $7, $3, 3, ROUTE_26 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKEDEX, 3, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1 + object_event SPRITE_POKEDEX, 3, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1 diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index 464835a5f..11a8cc50d 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE26HEALSPEECHHOUSE_TEACHER Route26HealSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -57,14 +57,14 @@ Route26HealSpeechHouse_MapEventHeader: warp_def $7, $2, 2, ROUTE_26 warp_def $7, $3, 2, ROUTE_26 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, Route26HealHouseBookshelf - signpost 1, 1, SIGNPOST_READ, Route26HealHouseBookshelf + bg_event 1, 0, BGEVENT_READ, Route26HealHouseBookshelf + bg_event 1, 1, BGEVENT_READ, Route26HealHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1 + object_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1 diff --git a/maps/Route27.asm b/maps/Route27.asm index 10716d9fb..a058af254 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -10,18 +10,18 @@ const_value set 2 const ROUTE27_FISHER Route27_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end UnknownScript_0x1a0873: @@ -42,7 +42,7 @@ UnknownScript_0x1a088c: writetext Route27FisherText waitbutton closetext - dotrigger $1 + setscene $1 end Route27FisherScript: @@ -477,23 +477,23 @@ Route27_MapEventHeader: warp_def $5, $1a, 1, TOHJO_FALLS warp_def $5, $24, 2, TOHJO_FALLS -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $a, $12, UnknownScript_0x1a0873 - xy_trigger 0, $a, $13, UnknownScript_0x1a0881 + coord_event 0, $a, $12, UnknownScript_0x1a0873 + coord_event 0, $a, $13, UnknownScript_0x1a0881 -.Signposts: +.BGEvents: db 1 - signpost 7, 25, SIGNPOST_READ, TohjoFallsSign + bg_event 7, 25, BGEVENT_READ, TohjoFallsSign -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_COOLTRAINER_M, 7, 48, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1 - person_event SPRITE_COOLTRAINER_M, 6, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1 - person_event SPRITE_COOLTRAINER_F, 10, 72, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerCooltrainerfReena, -1 - person_event SPRITE_COOLTRAINER_F, 6, 37, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1 - person_event SPRITE_YOUNGSTER, 7, 65, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicGilbert, -1 - person_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperJose2, -1 - person_event SPRITE_POKE_BALL, 12, 60, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM - person_event SPRITE_POKE_BALL, 12, 53, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY - person_event SPRITE_FISHER, 10, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 3, Route27FisherScript, -1 + object_event SPRITE_COOLTRAINER_M, 7, 48, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1 + object_event SPRITE_COOLTRAINER_M, 6, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1 + object_event SPRITE_COOLTRAINER_F, 10, 72, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfReena, -1 + object_event SPRITE_COOLTRAINER_F, 6, 37, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1 + object_event SPRITE_YOUNGSTER, 7, 65, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicGilbert, -1 + object_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperJose2, -1 + object_event SPRITE_POKE_BALL, 12, 60, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM + object_event SPRITE_POKE_BALL, 12, 53, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY + object_event SPRITE_FISHER, 10, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 3, Route27FisherScript, -1 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 1a7d77dee..5e43f661c 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE27SANDSTORMHOUSE_GRANNY Route27SandstormHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -102,14 +102,14 @@ Route27SandstormHouse_MapEventHeader: warp_def $7, $2, 1, ROUTE_27 warp_def $7, $3, 1, ROUTE_27 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, SandstormHouseBookshelf - signpost 1, 1, SIGNPOST_READ, SandstormHouseBookshelf + bg_event 1, 0, BGEVENT_READ, SandstormHouseBookshelf + bg_event 1, 1, BGEVENT_READ, SandstormHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_GRANNY, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SandstormHouseWoman, -1 + object_event SPRITE_GRANNY, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SandstormHouseWoman, -1 diff --git a/maps/Route28.asm b/maps/Route28.asm index 6923947fb..eb87b2701 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -1,5 +1,5 @@ Route28_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -25,13 +25,13 @@ Route28_MapEventHeader: warp_def $3, $7, 1, ROUTE_28_FAMOUS_SPEECH_HOUSE warp_def $5, $21, 7, VICTORY_ROAD_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 5, 31, SIGNPOST_READ, Route28Sign - signpost 2, 25, SIGNPOST_ITEM, Route28HiddenRareCandy + bg_event 5, 31, BGEVENT_READ, Route28Sign + bg_event 2, 25, BGEVENT_ITEM, Route28HiddenRareCandy -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index 65a36d872..e8da9da02 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -3,14 +3,14 @@ const_value set 2 const ROUTE28FAMOUSSPEECHHOUSE_FEAROW Route28FamousSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - maptrigger .DummyTrigger + scene_script .DummyScene .MapCallbacks: db 0 -.DummyTrigger: +.DummyScene: end Celebrity: @@ -79,15 +79,15 @@ Route28FamousSpeechHouse_MapEventHeader: warp_def $7, $2, 1, ROUTE_28 warp_def $7, $3, 1, ROUTE_28 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, CelebrityHouseBookshelf - signpost 1, 1, SIGNPOST_READ, CelebrityHouseBookshelf + bg_event 1, 0, BGEVENT_READ, CelebrityHouseBookshelf + bg_event 1, 1, BGEVENT_READ, CelebrityHouseBookshelf -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Celebrity, -1 - person_event SPRITE_MOLTRES, 5, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CelebritysFearow, -1 + object_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Celebrity, -1 + object_event SPRITE_MOLTRES, 5, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CelebritysFearow, -1 diff --git a/maps/Route29.asm b/maps/Route29.asm index c84318b80..a7bb9ecc5 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -9,19 +9,19 @@ const_value set 2 const ROUTE29_POKE_BALL Route29_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 dbw MAPCALLBACK_OBJECTS, .Tuscany -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end .Tuscany: @@ -59,7 +59,7 @@ Route29Tutorial1: writetext CatchingTutorialDebriefText waitbutton closetext - dotrigger $0 + setscene $0 setevent EVENT_LEARNED_TO_CATCH_POKEMON end @@ -84,7 +84,7 @@ Route29Tutorial2: writetext CatchingTutorialDebriefText waitbutton closetext - dotrigger $0 + setscene $0 setevent EVENT_LEARNED_TO_CATCH_POKEMON end @@ -93,7 +93,7 @@ Script_RefusedTutorial1: waitbutton closetext applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1b - dotrigger $0 + setscene $0 end Script_RefusedTutorial2: @@ -101,7 +101,7 @@ Script_RefusedTutorial2: waitbutton closetext applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b - dotrigger $0 + setscene $0 end CatchingTutorialDudeScript: @@ -423,23 +423,23 @@ Route29_MapEventHeader: db 1 warp_def $1, $1b, 3, ROUTE_29_46_GATE -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 1, $8, $35, Route29Tutorial1 - xy_trigger 1, $9, $35, Route29Tutorial2 + coord_event 1, $8, $35, Route29Tutorial1 + coord_event 1, $9, $35, Route29Tutorial2 -.Signposts: +.BGEvents: db 2 - signpost 7, 51, SIGNPOST_READ, Route29Sign1 - signpost 5, 3, SIGNPOST_READ, Route29Sign2 + bg_event 7, 51, BGEVENT_READ, Route29Sign1 + bg_event 5, 3, BGEVENT_READ, Route29Sign2 -.PersonEvents: +.ObjectEvents: db 8 - person_event SPRITE_COOLTRAINER_M, 12, 50, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CatchingTutorialDudeScript, -1 - person_event SPRITE_YOUNGSTER, 16, 27, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route29YoungsterScript, -1 - person_event SPRITE_TEACHER, 11, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route29TeacherScript, -1 - person_event SPRITE_FRUIT_TREE, 2, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route29FruitTree, -1 - person_event SPRITE_FISHER, 3, 25, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route29FisherScript, -1 - person_event SPRITE_COOLTRAINER_M, 4, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1 - person_event SPRITE_TEACHER, 12, 29, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY - person_event SPRITE_POKE_BALL, 2, 48, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION + object_event SPRITE_COOLTRAINER_M, 12, 50, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CatchingTutorialDudeScript, -1 + object_event SPRITE_YOUNGSTER, 16, 27, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29YoungsterScript, -1 + object_event SPRITE_TEACHER, 11, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29TeacherScript, -1 + object_event SPRITE_FRUIT_TREE, 2, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route29FruitTree, -1 + object_event SPRITE_FISHER, 3, 25, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route29FisherScript, -1 + object_event SPRITE_COOLTRAINER_M, 4, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1 + object_event SPRITE_TEACHER, 12, 29, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY + object_event SPRITE_POKE_BALL, 2, 48, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm index d2fa5d5dc..a3d824eec 100644 --- a/maps/Route2946Gate.asm +++ b/maps/Route2946Gate.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE2946GATE_YOUNGSTER Route2946Gate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -47,13 +47,13 @@ Route2946Gate_MapEventHeader: warp_def $7, $4, 1, ROUTE_29 warp_def $7, $5, 1, ROUTE_29 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route2946GateOfficerScript, -1 - person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route2946GateYoungsterScript, -1 + object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route2946GateOfficerScript, -1 + object_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route2946GateYoungsterScript, -1 diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 1647215b9..954714590 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE2GATE_SCIENTIST Route2Gate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -36,12 +36,12 @@ Route2Gate_MapEventHeader: warp_def $7, $4, 2, ROUTE_2 warp_def $7, $5, 2, ROUTE_2 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_SCIENTIST, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route2GateScientistScript, -1 + object_event SPRITE_SCIENTIST, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2GateScientistScript, -1 diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index b7f6fc8e9..4ff8e2a18 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE2NUGGETSPEECHHOUSE_FISHER Route2NuggetSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -61,12 +61,12 @@ Route2NuggetSpeechHouse_MapEventHeader: warp_def $7, $2, 1, ROUTE_2 warp_def $7, $3, 1, ROUTE_2 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FisherScript_0x9b847, -1 + object_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x9b847, -1 diff --git a/maps/Route3.asm b/maps/Route3.asm index 5b5d9a1d2..0df90cd80 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -5,7 +5,7 @@ const_value set 2 const ROUTE3_FISHER2 Route3_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -140,16 +140,16 @@ Route3_MapEventHeader: db 1 warp_def $1, $34, 1, MOUNT_MOON -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 13, 49, SIGNPOST_READ, MapRoute3Signpost0Script + bg_event 13, 49, BGEVENT_READ, MapRoute3Signpost0Script -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_FISHER, 12, 26, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1 - person_event SPRITE_YOUNGSTER, 7, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterWarren, -1 - person_event SPRITE_YOUNGSTER, 3, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1 - person_event SPRITE_FISHER, 5, 49, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerFirebreatherBurt, -1 + object_event SPRITE_FISHER, 12, 26, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1 + object_event SPRITE_YOUNGSTER, 7, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterWarren, -1 + object_event SPRITE_YOUNGSTER, 3, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1 + object_event SPRITE_FISHER, 5, 49, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerFirebreatherBurt, -1 diff --git a/maps/Route30.asm b/maps/Route30.asm index 725c0b25f..7a98c6a7e 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -12,7 +12,7 @@ const_value set 2 const ROUTE30_POKE_BALL Route30_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -416,27 +416,27 @@ Route30_MapEventHeader: warp_def $27, $7, 1, ROUTE_30_BERRY_SPEECH_HOUSE warp_def $5, $11, 1, MR_POKEMONS_HOUSE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 5 - signpost 43, 9, SIGNPOST_READ, Route30Sign - signpost 29, 13, SIGNPOST_READ, MrPokemonsHouseDirectionsSign - signpost 5, 15, SIGNPOST_READ, MrPokemonsHouseSign - signpost 21, 3, SIGNPOST_READ, Route30TrainerTips - signpost 9, 14, SIGNPOST_ITEM, Route30HiddenPotion + bg_event 43, 9, BGEVENT_READ, Route30Sign + bg_event 29, 13, BGEVENT_READ, MrPokemonsHouseDirectionsSign + bg_event 5, 15, BGEVENT_READ, MrPokemonsHouseSign + bg_event 21, 3, BGEVENT_READ, Route30TrainerTips + bg_event 9, 14, BGEVENT_ITEM, Route30HiddenPotion -.PersonEvents: +.ObjectEvents: db 11 - person_event SPRITE_YOUNGSTER, 26, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE - person_event SPRITE_YOUNGSTER, 28, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY - person_event SPRITE_YOUNGSTER, 23, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerYoungsterMikey, -1 - person_event SPRITE_BUG_CATCHER, 7, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherDon, -1 - person_event SPRITE_YOUNGSTER, 30, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route30YoungsterScript, -1 - person_event SPRITE_MONSTER, 24, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE - person_event SPRITE_MONSTER, 25, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE - person_event SPRITE_FRUIT_TREE, 39, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route30FruitTree1, -1 - person_event SPRITE_FRUIT_TREE, 5, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route30FruitTree2, -1 - person_event SPRITE_COOLTRAINER_F, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1 - person_event SPRITE_POKE_BALL, 35, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE + object_event SPRITE_YOUNGSTER, 26, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE + object_event SPRITE_YOUNGSTER, 28, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY + object_event SPRITE_YOUNGSTER, 23, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1 + object_event SPRITE_BUG_CATCHER, 7, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherDon, -1 + object_event SPRITE_YOUNGSTER, 30, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route30YoungsterScript, -1 + object_event SPRITE_MONSTER, 24, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE + object_event SPRITE_MONSTER, 25, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE + object_event SPRITE_FRUIT_TREE, 39, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree1, -1 + object_event SPRITE_FRUIT_TREE, 5, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree2, -1 + object_event SPRITE_COOLTRAINER_F, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1 + object_event SPRITE_POKE_BALL, 35, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index 332ee58e7..55dbff282 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE30BERRYSPEECHHOUSE_POKEFAN_M Route30BerrySpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -55,14 +55,14 @@ Route30BerrySpeechHouse_MapEventHeader: warp_def $7, $2, 1, ROUTE_30 warp_def $7, $3, 1, ROUTE_30 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, Route30BerrySpeechHouseBookshelf - signpost 1, 1, SIGNPOST_READ, Route30BerrySpeechHouseBookshelf + bg_event 1, 0, BGEVENT_READ, Route30BerrySpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1 + object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1 diff --git a/maps/Route31.asm b/maps/Route31.asm index 14729ecd9..d356f2c6f 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -8,7 +8,7 @@ const_value set 2 const ROUTE31_POKE_BALL2 Route31_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -426,20 +426,20 @@ Route31_MapEventHeader: warp_def $7, $4, 4, ROUTE_31_VIOLET_GATE warp_def $5, $22, 1, DARK_CAVE_VIOLET_ENTRANCE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 5, 7, SIGNPOST_READ, Route31Sign - signpost 5, 31, SIGNPOST_READ, DarkCaveSign + bg_event 5, 7, BGEVENT_READ, Route31Sign + bg_event 5, 31, BGEVENT_READ, DarkCaveSign -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_FISHER, 7, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route31MailRecipientScript, -1 - person_event SPRITE_YOUNGSTER, 5, 9, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route31YoungsterScript, -1 - person_event SPRITE_BUG_CATCHER, 13, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 5, TrainerBug_catcherWade1, -1 - person_event SPRITE_COOLTRAINER_M, 8, 33, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route31CooltrainerMScript, -1 - person_event SPRITE_FRUIT_TREE, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route31FruitTree, -1 - person_event SPRITE_POKE_BALL, 5, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION - person_event SPRITE_POKE_BALL, 15, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route31PokeBall, EVENT_ROUTE_31_POKE_BALL + object_event SPRITE_FISHER, 7, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31MailRecipientScript, -1 + object_event SPRITE_YOUNGSTER, 5, 9, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1 + object_event SPRITE_BUG_CATCHER, 13, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBug_catcherWade1, -1 + object_event SPRITE_COOLTRAINER_M, 8, 33, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31CooltrainerMScript, -1 + object_event SPRITE_FRUIT_TREE, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31FruitTree, -1 + object_event SPRITE_POKE_BALL, 5, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION + object_event SPRITE_POKE_BALL, 15, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31PokeBall, EVENT_ROUTE_31_POKE_BALL diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index de72c9a51..404a216e2 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE31VIOLETGATE_COOLTRAINER_F Route31VioletGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -38,13 +38,13 @@ Route31VioletGate_MapEventHeader: warp_def $4, $9, 1, ROUTE_31 warp_def $5, $9, 2, ROUTE_31 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1 - person_event SPRITE_COOLTRAINER_F, 2, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1 + object_event SPRITE_COOLTRAINER_F, 2, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1 diff --git a/maps/Route32.asm b/maps/Route32.asm index 7da56507a..660f972f3 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -15,23 +15,23 @@ const_value set 2 const ROUTE32_POKE_BALL2 Route32_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 3 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 - maptrigger .DummyTrigger2 + scene_script .DummyScene0 + scene_script .DummyScene1 + scene_script .DummyScene2 .MapCallbacks: db 1 dbw MAPCALLBACK_OBJECTS, .Frieda -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end -.DummyTrigger2: +.DummyScene2: end .Frieda: @@ -46,7 +46,7 @@ Route32_MapScriptHeader: Route32CooltrainerMScript: faceplayer -Route32CooltrainerMTrigger: +Route32CooltrainerMContinueScene: opentext checkevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 iftrue .GotMiracleSeed @@ -86,7 +86,7 @@ Route32CooltrainerMTrigger: closetext end -Route32CooltrainerMStopsYou: +Route32CooltrainerMStopsYouScene: spriteface ROUTE32_COOLTRAINER_M, LEFT spriteface PLAYER, RIGHT opentext @@ -97,7 +97,7 @@ Route32CooltrainerMStopsYou: applymovement PLAYER, Movement_Route32CooltrainerMPushesYouBackToViolet stopfollow spriteface PLAYER, DOWN - scall Route32CooltrainerMTrigger + scall Route32CooltrainerMContinueScene applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset1 applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset2 end @@ -127,7 +127,7 @@ Route32WannaBuyASlowpokeTailScript: SlowpokeTailSalesmanScript: faceplayer _OfferToSellSlowpokeTail: - dotrigger $2 + setscene $2 opentext writetext Text_MillionDollarSlowpokeTail yesorno @@ -941,33 +941,33 @@ Route32_MapEventHeader: warp_def $3, $4, 4, ROUTE_32_RUINS_OF_ALPH_GATE warp_def $4f, $6, 4, UNION_CAVE_1F -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $8, $12, Route32CooltrainerMStopsYou - xy_trigger 1, $47, $7, Route32WannaBuyASlowpokeTailScript + coord_event 0, $8, $12, Route32CooltrainerMStopsYouScene + coord_event 1, $47, $7, Route32WannaBuyASlowpokeTailScript -.Signposts: +.BGEvents: db 6 - signpost 5, 13, SIGNPOST_READ, Route32Sign - signpost 1, 9, SIGNPOST_READ, Route32RuinsSign - signpost 84, 10, SIGNPOST_READ, Route32UnionCaveSign - signpost 73, 12, SIGNPOST_READ, Route32PokecenterSign - signpost 67, 12, SIGNPOST_ITEM, Route32HiddenGreatBall - signpost 40, 11, SIGNPOST_ITEM, Route32HiddenSuperPotion + bg_event 5, 13, BGEVENT_READ, Route32Sign + bg_event 1, 9, BGEVENT_READ, Route32RuinsSign + bg_event 84, 10, BGEVENT_READ, Route32UnionCaveSign + bg_event 73, 12, BGEVENT_READ, Route32PokecenterSign + bg_event 67, 12, BGEVENT_ITEM, Route32HiddenGreatBall + bg_event 40, 11, BGEVENT_ITEM, Route32HiddenSuperPotion -.PersonEvents: +.ObjectEvents: db 14 - person_event SPRITE_FISHER, 49, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherJustin, -1 - person_event SPRITE_FISHER, 56, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherRalph1, -1 - person_event SPRITE_FISHER, 48, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherHenry, -1 - person_event SPRITE_YOUNGSTER, 22, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterAlbert, -1 - person_event SPRITE_YOUNGSTER, 63, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterGordon, -1 - person_event SPRITE_YOUNGSTER, 45, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperRoland, -1 - person_event SPRITE_LASS, 30, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerLiz1, -1 - person_event SPRITE_COOLTRAINER_M, 8, 19, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1 - person_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperPeter, -1 - person_event SPRITE_FISHER, 70, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS - person_event SPRITE_POKE_BALL, 53, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL - person_event SPRITE_FISHER, 13, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route32RoarTMGuyScript, -1 - person_event SPRITE_LASS, 67, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY - person_event SPRITE_POKE_BALL, 30, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL + object_event SPRITE_FISHER, 49, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherJustin, -1 + object_event SPRITE_FISHER, 56, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherRalph1, -1 + object_event SPRITE_FISHER, 48, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherHenry, -1 + object_event SPRITE_YOUNGSTER, 22, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterAlbert, -1 + object_event SPRITE_YOUNGSTER, 63, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterGordon, -1 + object_event SPRITE_YOUNGSTER, 45, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperRoland, -1 + object_event SPRITE_LASS, 30, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerLiz1, -1 + object_event SPRITE_COOLTRAINER_M, 8, 19, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1 + object_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperPeter, -1 + object_event SPRITE_FISHER, 70, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS + object_event SPRITE_POKE_BALL, 53, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL + object_event SPRITE_FISHER, 13, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32RoarTMGuyScript, -1 + object_event SPRITE_LASS, 67, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY + object_event SPRITE_POKE_BALL, 30, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index bc9f4f0f8..a65239d31 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE32POKECENTER1F_COOLTRAINER_F Route32Pokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -104,14 +104,14 @@ Route32Pokecenter1F_MapEventHeader: warp_def $7, $4, 1, ROUTE_32 warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x69b52, -1 - person_event SPRITE_FISHING_GURU, 4, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x69b52, -1 + object_event SPRITE_FISHING_GURU, 4, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1 + object_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1 diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm index 523fee2e9..8b9dcede0 100644 --- a/maps/Route32RuinsOfAlphGate.asm +++ b/maps/Route32RuinsOfAlphGate.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE32RUINSOFALPHGATE_YOUNGSTER Route32RuinsOfAlphGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -57,14 +57,14 @@ Route32RuinsOfAlphGate_MapEventHeader: warp_def $4, $9, 2, ROUTE_32 warp_def $5, $9, 3, ROUTE_32 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1 - person_event SPRITE_POKEFAN_M, 2, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1 - person_event SPRITE_YOUNGSTER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1 + object_event SPRITE_POKEFAN_M, 2, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1 + object_event SPRITE_YOUNGSTER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1 diff --git a/maps/Route33.asm b/maps/Route33.asm index 54d84b82b..e92e0cbb1 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE33_FRUIT_TREE Route33_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -202,15 +202,15 @@ Route33_MapEventHeader: db 1 warp_def $9, $b, 3, UNION_CAVE_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 11, 11, SIGNPOST_READ, Route33Sign + bg_event 11, 11, BGEVENT_READ, Route33Sign -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_POKEFAN_M, 13, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerAnthony, -1 - person_event SPRITE_LASS, 16, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route33LassScript, -1 - person_event SPRITE_FRUIT_TREE, 16, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route33FruitTreeScript, -1 + object_event SPRITE_POKEFAN_M, 13, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1 + object_event SPRITE_LASS, 16, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route33LassScript, -1 + object_event SPRITE_FRUIT_TREE, 16, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTreeScript, -1 diff --git a/maps/Route34.asm b/maps/Route34.asm index b7127454e..633e9984a 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -14,7 +14,7 @@ const_value set 2 const ROUTE34_POKE_BALL Route34_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -774,29 +774,29 @@ Route34_MapEventHeader: warp_def $f, $b, 2, DAY_CARE warp_def $f, $d, 3, DAY_CARE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 5 - signpost 6, 12, SIGNPOST_READ, Route34Sign - signpost 33, 13, SIGNPOST_READ, Route34TrainerTips - signpost 13, 10, SIGNPOST_READ, DayCareSign - signpost 32, 8, SIGNPOST_ITEM, Route34HiddenRareCandy - signpost 19, 17, SIGNPOST_ITEM, Route34HiddenSuperPotion + bg_event 6, 12, BGEVENT_READ, Route34Sign + bg_event 33, 13, BGEVENT_READ, Route34TrainerTips + bg_event 13, 10, BGEVENT_READ, DayCareSign + bg_event 32, 8, BGEVENT_ITEM, Route34HiddenRareCandy + bg_event 19, 17, BGEVENT_ITEM, Route34HiddenSuperPotion -.PersonEvents: +.ObjectEvents: db 13 - person_event SPRITE_YOUNGSTER, 7, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 5, TrainerCamperTodd1, -1 - person_event SPRITE_YOUNGSTER, 32, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterSamuel, -1 - person_event SPRITE_YOUNGSTER, 20, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterIan, -1 - person_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerPicnickerGina1, -1 - person_event SPRITE_OFFICER, 11, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerKeithScript, -1 - person_event SPRITE_POKEFAN_M, 28, 18, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmBrandon, -1 - person_event SPRITE_GRAMPS, 16, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareManScript_Outside, EVENT_DAY_CARE_MAN_ON_ROUTE_34 - person_event SPRITE_DAY_CARE_MON_1, 18, 14, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareMon1Script, EVENT_DAY_CARE_MON_1 - person_event SPRITE_DAY_CARE_MON_2, 19, 17, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareMon2Script, EVENT_DAY_CARE_MON_2 - person_event SPRITE_COOLTRAINER_F, 48, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1 - person_event SPRITE_COOLTRAINER_F, 48, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1 - person_event SPRITE_COOLTRAINER_F, 51, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1 - person_event SPRITE_POKE_BALL, 30, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET + object_event SPRITE_YOUNGSTER, 7, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperTodd1, -1 + object_event SPRITE_YOUNGSTER, 32, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterSamuel, -1 + object_event SPRITE_YOUNGSTER, 20, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterIan, -1 + object_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerGina1, -1 + object_event SPRITE_OFFICER, 11, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerKeithScript, -1 + object_event SPRITE_POKEFAN_M, 28, 18, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmBrandon, -1 + object_event SPRITE_GRAMPS, 16, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Outside, EVENT_DAY_CARE_MAN_ON_ROUTE_34 + object_event SPRITE_DAY_CARE_MON_1, 18, 14, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareMon1Script, EVENT_DAY_CARE_MON_1 + object_event SPRITE_DAY_CARE_MON_2, 19, 17, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareMon2Script, EVENT_DAY_CARE_MON_2 + object_event SPRITE_COOLTRAINER_F, 48, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1 + object_event SPRITE_COOLTRAINER_F, 48, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1 + object_event SPRITE_COOLTRAINER_F, 51, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1 + object_event SPRITE_POKE_BALL, 30, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index d629eecdd..799cb4d9e 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -5,7 +5,7 @@ const_value set 2 const ROUTE34ILEXFORESTGATE_TEACHER2 Route34IlexForestGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -146,16 +146,16 @@ Route34IlexForestGate_MapEventHeader: warp_def $7, $4, 1, ILEX_FOREST warp_def $7, $5, 1, ILEX_FOREST -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $7, $4, UnknownScript_0x62d3d + coord_event 0, $7, $4, UnknownScript_0x62d3d -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_TEACHER, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER - person_event SPRITE_BUTTERFREE, 4, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, IlexGateButterfree, -1 - person_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS - person_event SPRITE_TEACHER, 7, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY + object_event SPRITE_TEACHER, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER + object_event SPRITE_BUTTERFREE, 4, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexGateButterfree, -1 + object_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS + object_event SPRITE_TEACHER, 7, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY diff --git a/maps/Route35.asm b/maps/Route35.asm index 7d5d2d48a..2e10bd22a 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -12,7 +12,7 @@ const_value set 2 const ROUTE35_POKE_BALL Route35_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -472,24 +472,24 @@ Route35_MapEventHeader: warp_def $21, $a, 2, ROUTE_35_GOLDENROD_GATE warp_def $5, $3, 3, ROUTE_35_NATIONAL_PARK_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 7, 1, SIGNPOST_READ, Route35Sign - signpost 31, 11, SIGNPOST_READ, Route35Sign + bg_event 7, 1, BGEVENT_READ, Route35Sign + bg_event 31, 11, BGEVENT_READ, Route35Sign -.PersonEvents: +.ObjectEvents: db 11 - person_event SPRITE_YOUNGSTER, 19, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerCamperIvan, -1 - person_event SPRITE_YOUNGSTER, 20, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperElliot, -1 - person_event SPRITE_LASS, 20, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1 - person_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerKim, -1 - person_event SPRITE_YOUNGSTER, 28, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 0, TrainerBird_keeperBryan, -1 - person_event SPRITE_FISHER, 10, 2, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1 - person_event SPRITE_BUG_CATCHER, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherArnie1, -1 - person_event SPRITE_SUPER_NERD, 10, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerJugglerIrwin, -1 - person_event SPRITE_OFFICER, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19ca49, -1 - person_event SPRITE_FRUIT_TREE, 25, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1 - person_event SPRITE_POKE_BALL, 16, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT + object_event SPRITE_YOUNGSTER, 19, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperIvan, -1 + object_event SPRITE_YOUNGSTER, 20, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperElliot, -1 + object_event SPRITE_LASS, 20, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1 + object_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerKim, -1 + object_event SPRITE_YOUNGSTER, 28, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerBird_keeperBryan, -1 + object_event SPRITE_FISHER, 10, 2, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1 + object_event SPRITE_BUG_CATCHER, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherArnie1, -1 + object_event SPRITE_SUPER_NERD, 10, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerJugglerIrwin, -1 + object_event SPRITE_OFFICER, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x19ca49, -1 + object_event SPRITE_FRUIT_TREE, 25, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1 + object_event SPRITE_POKE_BALL, 16, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index 4cdf461df..bfc8e688d 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE35GOLDENRODGATE_FISHER Route35GoldenrodGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -206,14 +206,14 @@ Route35GoldenrodGate_MapEventHeader: warp_def $7, $4, 12, GOLDENROD_CITY warp_def $7, $5, 12, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1 - person_event SPRITE_POKEFAN_F, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1 - person_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1 + object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1 + object_event SPRITE_POKEFAN_F, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1 + object_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1 diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 935a8e518..c3c38a34f 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -4,21 +4,21 @@ const_value set 2 const ROUTE35NATIONALPARKGATE_OFFICER2 Route35NationalParkGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 3 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 - maptrigger .LeaveContestEarly + scene_script .DummyScene0 + scene_script .DummyScene1 + scene_script .LeaveContestEarly .MapCallbacks: db 2 dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end .LeaveContestEarly: @@ -28,11 +28,11 @@ Route35NationalParkGate_MapScriptHeader: .CheckIfContestRunning: checkflag ENGINE_BUG_CONTEST_TIMER iftrue .BugContestIsRunning - dotrigger $0 + setscene $0 return .BugContestIsRunning: - dotrigger $2 + setscene $2 return .CheckIfContestAvailable: @@ -448,15 +448,15 @@ Route35NationalParkGate_MapEventHeader: warp_def $7, $3, 3, ROUTE_35 warp_def $7, $4, 3, ROUTE_35 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 0, 5, SIGNPOST_READ, MapRoute36NationalParkGateSignpost0Script + bg_event 0, 5, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_OFFICER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY - person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER - person_event SPRITE_OFFICER, 3, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY + object_event SPRITE_OFFICER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + object_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER + object_event SPRITE_OFFICER, 3, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route36.asm b/maps/Route36.asm index d0accbaa7..86f7ca9fe 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -10,19 +10,19 @@ const_value set 2 const ROUTE36_SUICUNE Route36_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 dbw MAPCALLBACK_OBJECTS, .ArthurCallback -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end .ArthurCallback: @@ -44,9 +44,9 @@ Route36SuicuneScript: disappear ROUTE36_SUICUNE spriteface PLAYER, DOWN pause 10 - dotrigger $0 + setscene $0 clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY - domaptrigger CIANWOOD_CITY, $1 + setmapscene CIANWOOD_CITY, $1 end SudowoodoScript: @@ -670,26 +670,26 @@ Route36_MapEventHeader: warp_def $d, $2f, 1, ROUTE_36_RUINS_OF_ALPH_GATE warp_def $d, $30, 2, ROUTE_36_RUINS_OF_ALPH_GATE -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 1, $7, $14, Route36SuicuneScript - xy_trigger 1, $7, $16, Route36SuicuneScript + coord_event 1, $7, $14, Route36SuicuneScript + coord_event 1, $7, $16, Route36SuicuneScript -.Signposts: +.BGEvents: db 4 - signpost 1, 29, SIGNPOST_READ, Route36TrainerTips2 - signpost 11, 45, SIGNPOST_READ, RuinsOfAlphNorthSign - signpost 7, 55, SIGNPOST_READ, Route36Sign - signpost 7, 21, SIGNPOST_READ, Route36TrainerTips1 + bg_event 1, 29, BGEVENT_READ, Route36TrainerTips2 + bg_event 11, 45, BGEVENT_READ, RuinsOfAlphNorthSign + bg_event 7, 55, BGEVENT_READ, Route36Sign + bg_event 7, 21, BGEVENT_READ, Route36TrainerTips1 -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_YOUNGSTER, 13, 20, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicMark, -1 - person_event SPRITE_YOUNGSTER, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1 - person_event SPRITE_WEIRD_TREE, 9, 35, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO - person_event SPRITE_LASS, 8, 51, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x1940e0, -1 - person_event SPRITE_FISHER, 9, 44, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1 - person_event SPRITE_FRUIT_TREE, 4, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route36FruitTree, -1 - person_event SPRITE_YOUNGSTER, 6, 46, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY - person_event SPRITE_LASS, 12, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route36FloriaScript, EVENT_FLORIA_AT_SUDOWOODO - person_event SPRITE_SUICUNE, 6, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36 + object_event SPRITE_YOUNGSTER, 13, 20, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicMark, -1 + object_event SPRITE_YOUNGSTER, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1 + object_event SPRITE_WEIRD_TREE, 9, 35, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO + object_event SPRITE_LASS, 8, 51, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1940e0, -1 + object_event SPRITE_FISHER, 9, 44, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1 + object_event SPRITE_FRUIT_TREE, 4, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36FruitTree, -1 + object_event SPRITE_YOUNGSTER, 6, 46, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY + object_event SPRITE_LASS, 12, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route36FloriaScript, EVENT_FLORIA_AT_SUDOWOODO + object_event SPRITE_SUICUNE, 6, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36 diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index e6423cc36..8640b49cf 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -13,21 +13,21 @@ const_value set 2 const ROUTE36NATIONALPARKGATE_OFFICER2 Route36NationalParkGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 3 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 - maptrigger .LeaveContestEarly + scene_script .DummyScene0 + scene_script .DummyScene1 + scene_script .LeaveContestEarly .MapCallbacks: db 2 dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end .LeaveContestEarly: @@ -37,11 +37,11 @@ Route36NationalParkGate_MapScriptHeader: .CheckIfContestRunning: checkflag ENGINE_BUG_CONTEST_TIMER iftrue .BugContestIsRunning - dotrigger $0 + setscene $0 return .BugContestIsRunning: - dotrigger $2 + setscene $2 return .CheckIfContestAvailable: @@ -861,24 +861,24 @@ Route36NationalParkGate_MapEventHeader: warp_def $4, $9, 1, ROUTE_36 warp_def $5, $9, 2, ROUTE_36 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 0, 6, SIGNPOST_READ, MapRoute36NationalParkGateSignpost0Script + bg_event 0, 6, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script -.PersonEvents: +.ObjectEvents: db 12 - person_event SPRITE_OFFICER, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY - person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B - person_event SPRITE_YOUNGSTER, 5, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B - person_event SPRITE_ROCKER, 6, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B - person_event SPRITE_POKEFAN_M, 5, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B - person_event SPRITE_YOUNGSTER, 7, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B - person_event SPRITE_YOUNGSTER, 6, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B - person_event SPRITE_LASS, 6, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B - person_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B - person_event SPRITE_YOUNGSTER, 7, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B - person_event SPRITE_YOUNGSTER, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B - person_event SPRITE_OFFICER, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY + object_event SPRITE_OFFICER, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + object_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B + object_event SPRITE_YOUNGSTER, 5, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B + object_event SPRITE_ROCKER, 6, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B + object_event SPRITE_POKEFAN_M, 5, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B + object_event SPRITE_YOUNGSTER, 7, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B + object_event SPRITE_YOUNGSTER, 6, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B + object_event SPRITE_LASS, 6, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B + object_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B + object_event SPRITE_YOUNGSTER, 7, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B + object_event SPRITE_YOUNGSTER, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B + object_event SPRITE_OFFICER, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm index 95501862a..a41d6b558 100644 --- a/maps/Route36RuinsOfAlphGate.asm +++ b/maps/Route36RuinsOfAlphGate.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE36RUINSOFALPHGATE_GRAMPS Route36RuinsOfAlphGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -45,13 +45,13 @@ Route36RuinsOfAlphGate_MapEventHeader: warp_def $7, $4, 9, RUINS_OF_ALPH_OUTSIDE warp_def $7, $5, 9, RUINS_OF_ALPH_OUTSIDE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route36RuinsOfAlphGateOfficerScript, -1 - person_event SPRITE_GRAMPS, 5, 7, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, Route36RuinsOfAlphGateGrampsScript, -1 + object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateOfficerScript, -1 + object_event SPRITE_GRAMPS, 5, 7, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateGrampsScript, -1 diff --git a/maps/Route37.asm b/maps/Route37.asm index 0c1c926b3..5be5bb297 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -8,7 +8,7 @@ const_value set 2 const ROUTE37_FRUIT_TREE3 Route37_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -245,20 +245,20 @@ Route37_MapEventHeader: .Warps: db 0 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 3, 5, SIGNPOST_READ, Route37Sign - signpost 2, 4, SIGNPOST_ITEM, Route37HiddenEther + bg_event 3, 5, BGEVENT_READ, Route37Sign + bg_event 2, 4, BGEVENT_ITEM, Route37HiddenEther -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_WEIRD_TREE, 12, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1 - person_event SPRITE_WEIRD_TREE, 12, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1 - person_event SPRITE_YOUNGSTER, 6, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerPsychicGreg, -1 - person_event SPRITE_FRUIT_TREE, 5, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e09, -1 - person_event SPRITE_BUG_CATCHER, 8, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY - person_event SPRITE_FRUIT_TREE, 5, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0b, -1 - person_event SPRITE_FRUIT_TREE, 7, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0d, -1 + object_event SPRITE_WEIRD_TREE, 12, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1 + object_event SPRITE_WEIRD_TREE, 12, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1 + object_event SPRITE_YOUNGSTER, 6, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1 + object_event SPRITE_FRUIT_TREE, 5, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e09, -1 + object_event SPRITE_BUG_CATCHER, 8, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY + object_event SPRITE_FRUIT_TREE, 5, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0b, -1 + object_event SPRITE_FRUIT_TREE, 7, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0d, -1 diff --git a/maps/Route38.asm b/maps/Route38.asm index 0f4227e8e..f2ae60489 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -8,7 +8,7 @@ const_value set 2 const ROUTE38_BUENA2 Route38_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -481,20 +481,20 @@ Route38_MapEventHeader: warp_def $8, $23, 1, ROUTE_38_ECRUTEAK_GATE warp_def $9, $23, 2, ROUTE_38_ECRUTEAK_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 7, 33, SIGNPOST_READ, Route38Sign - signpost 13, 5, SIGNPOST_READ, Route38TrainerTips + bg_event 7, 33, BGEVENT_READ, Route38Sign + bg_event 13, 5, BGEVENT_READ, Route38TrainerTips -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_STANDING_YOUNGSTER, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1 - person_event SPRITE_LASS, 3, 15, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerLassDana1, -1 - person_event SPRITE_STANDING_YOUNGSTER, 15, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerBird_keeperToby, -1 - person_event SPRITE_BUENA, 9, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerBeautyValerie, -1 - person_event SPRITE_SAILOR, 5, 24, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerSailorHarry, -1 - person_event SPRITE_FRUIT_TREE, 10, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a1f33, -1 - person_event SPRITE_BUENA, 8, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerBeautyOlivia, -1 + object_event SPRITE_STANDING_YOUNGSTER, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1 + object_event SPRITE_LASS, 3, 15, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1 + object_event SPRITE_STANDING_YOUNGSTER, 15, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBird_keeperToby, -1 + object_event SPRITE_BUENA, 9, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1 + object_event SPRITE_SAILOR, 5, 24, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1 + object_event SPRITE_FRUIT_TREE, 10, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a1f33, -1 + object_event SPRITE_BUENA, 8, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyOlivia, -1 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index f61bcaaa4..a926c1e1c 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE38ECRUTEAKGATE_OFFICER Route38EcruteakGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -35,12 +35,12 @@ Route38EcruteakGate_MapEventHeader: warp_def $4, $9, 14, ECRUTEAK_CITY warp_def $5, $9, 15, ECRUTEAK_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route38EcruteakGateOfficerScript, -1 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route38EcruteakGateOfficerScript, -1 diff --git a/maps/Route39.asm b/maps/Route39.asm index 54e1426a5..1ab22b0d7 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -11,7 +11,7 @@ const_value set 2 const ROUTE39_POKEFAN_F2 Route39_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -353,25 +353,25 @@ Route39_MapEventHeader: warp_def $3, $1, 1, ROUTE_39_BARN warp_def $3, $5, 1, ROUTE_39_FARMHOUSE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 31, 5, SIGNPOST_READ, Route39TrainerTips - signpost 5, 9, SIGNPOST_READ, MoomooFarmSign - signpost 7, 15, SIGNPOST_READ, Route39Sign - signpost 13, 5, SIGNPOST_ITEM, Route39HiddenNugget + bg_event 31, 5, BGEVENT_READ, Route39TrainerTips + bg_event 5, 9, BGEVENT_READ, MoomooFarmSign + bg_event 7, 15, BGEVENT_READ, Route39Sign + bg_event 13, 5, BGEVENT_ITEM, Route39HiddenNugget -.PersonEvents: +.ObjectEvents: db 10 - person_event SPRITE_SAILOR, 29, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 5, TrainerSailorEugene, -1 - person_event SPRITE_POKEFAN_M, 22, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerPokefanmDerek1, -1 - person_event SPRITE_POKEFAN_F, 19, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerPokefanfRuth, -1 - person_event SPRITE_TAUROS, 12, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1 - person_event SPRITE_TAUROS, 11, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1 - person_event SPRITE_TAUROS, 15, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1 - person_event SPRITE_TAUROS, 13, 8, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1 - person_event SPRITE_STANDING_YOUNGSTER, 7, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerPsychicNorman, -1 - person_event SPRITE_FRUIT_TREE, 3, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1 - person_event SPRITE_POKEFAN_F, 22, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x1a5bbe, -1 + object_event SPRITE_SAILOR, 29, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSailorEugene, -1 + object_event SPRITE_POKEFAN_M, 22, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmDerek1, -1 + object_event SPRITE_POKEFAN_F, 19, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanfRuth, -1 + object_event SPRITE_TAUROS, 12, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 + object_event SPRITE_TAUROS, 11, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 + object_event SPRITE_TAUROS, 15, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 + object_event SPRITE_TAUROS, 13, 8, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 + object_event SPRITE_STANDING_YOUNGSTER, 7, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicNorman, -1 + object_event SPRITE_FRUIT_TREE, 3, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1 + object_event SPRITE_POKEFAN_F, 22, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x1a5bbe, -1 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 82fcfcd1a..ba6f56c1f 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE39BARN_MOOMOO Route39Barn_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -197,14 +197,14 @@ Route39Barn_MapEventHeader: warp_def $7, $3, 1, ROUTE_39 warp_def $7, $4, 1, ROUTE_39 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_TWIN, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1 - person_event SPRITE_TWIN, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1 - person_event SPRITE_TAUROS, 3, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MooMoo, -1 + object_event SPRITE_TWIN, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1 + object_event SPRITE_TWIN, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1 + object_event SPRITE_TAUROS, 3, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MooMoo, -1 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index c9d0c3b9e..194a43312 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE39FARMHOUSE_POKEFAN_F Route39Farmhouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -201,15 +201,15 @@ Route39Farmhouse_MapEventHeader: warp_def $7, $2, 2, ROUTE_39 warp_def $7, $3, 2, ROUTE_39 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, FarmhouseBookshelf - signpost 1, 1, SIGNPOST_READ, FarmhouseBookshelf + bg_event 1, 0, BGEVENT_READ, FarmhouseBookshelf + bg_event 1, 1, BGEVENT_READ, FarmhouseBookshelf -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKEFAN_M, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1 - person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1 + object_event SPRITE_POKEFAN_M, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1 + object_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1 diff --git a/maps/Route4.asm b/maps/Route4.asm index 4f6207cf3..cb1b18d69 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -5,7 +5,7 @@ const_value set 2 const ROUTE4_POKE_BALL Route4_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -129,17 +129,17 @@ Route4_MapEventHeader: db 1 warp_def $5, $2, 2, MOUNT_MOON -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 7, 3, SIGNPOST_READ, MtMoonSquareSign - signpost 3, 10, SIGNPOST_ITEM, Route4HiddenUltraBall + bg_event 7, 3, BGEVENT_READ, MtMoonSquareSign + bg_event 3, 10, BGEVENT_ITEM, Route4HiddenUltraBall -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperHank, -1 - person_event SPRITE_LASS, 8, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 4, TrainerPicnickerHope, -1 - person_event SPRITE_LASS, 6, 21, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 - person_event SPRITE_POKE_BALL, 3, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP + object_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperHank, -1 + object_event SPRITE_LASS, 8, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1 + object_event SPRITE_LASS, 6, 21, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 + object_event SPRITE_POKE_BALL, 3, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP diff --git a/maps/Route40.asm b/maps/Route40.asm index 65f36135a..5b33783c5 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -13,7 +13,7 @@ const_value set 2 const ROUTE40_STANDING_YOUNGSTER Route40_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -345,25 +345,25 @@ Route40_MapEventHeader: db 1 warp_def $5, $9, 1, ROUTE_40_BATTLE_TOWER_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 10, 14, SIGNPOST_READ, Route40Sign - signpost 8, 7, SIGNPOST_ITEM, Route40HiddenHyperPotion + bg_event 10, 14, BGEVENT_READ, Route40Sign + bg_event 8, 7, BGEVENT_ITEM, Route40HiddenHyperPotion -.PersonEvents: +.ObjectEvents: db 12 - person_event SPRITE_OLIVINE_RIVAL, 15, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerSwimmermSimon, -1 - person_event SPRITE_OLIVINE_RIVAL, 30, 18, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 5, TrainerSwimmermRandall, -1 - person_event SPRITE_SWIMMER_GIRL, 19, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1 - person_event SPRITE_SWIMMER_GIRL, 25, 10, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfPaula, -1 - person_event SPRITE_ROCK, 11, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route40Rock, -1 - person_event SPRITE_ROCK, 9, 6, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route40Rock, -1 - person_event SPRITE_ROCK, 8, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route40Rock, -1 - person_event SPRITE_LASS, 13, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route40Lass1Script, -1 - person_event SPRITE_BUENA, 10, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY - person_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1a61c7, -1 - person_event SPRITE_LASS, 4, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route40Lass2Script, -1 - person_event SPRITE_STANDING_YOUNGSTER, 9, 16, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + object_event SPRITE_OLIVINE_RIVAL, 15, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSimon, -1 + object_event SPRITE_OLIVINE_RIVAL, 30, 18, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerSwimmermRandall, -1 + object_event SPRITE_SWIMMER_GIRL, 19, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1 + object_event SPRITE_SWIMMER_GIRL, 25, 10, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfPaula, -1 + object_event SPRITE_ROCK, 11, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 + object_event SPRITE_ROCK, 9, 6, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 + object_event SPRITE_ROCK, 8, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 + object_event SPRITE_LASS, 13, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Lass1Script, -1 + object_event SPRITE_BUENA, 10, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY + object_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x1a61c7, -1 + object_event SPRITE_LASS, 4, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40Lass2Script, -1 + object_event SPRITE_STANDING_YOUNGSTER, 9, 16, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 238686d9d..6ffd98416 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE40BATTLETOWERGATE_TWIN Route40BattleTowerGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -81,13 +81,13 @@ Route40BattleTowerGate_MapEventHeader: warp_def $0, $4, 1, BATTLE_TOWER_OUTSIDE warp_def $0, $5, 2, BATTLE_TOWER_OUTSIDE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_ROCKER, 3, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR - person_event SPRITE_TWIN, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1 + object_event SPRITE_ROCKER, 3, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + object_event SPRITE_TWIN, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1 diff --git a/maps/Route41.asm b/maps/Route41.asm index 3ff1bb587..7ba8d9972 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -11,7 +11,7 @@ const_value set 2 const ROUTE41_SWIMMER_GIRL5 Route41_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -352,22 +352,22 @@ Route41_MapEventHeader: warp_def $25, $c, 1, WHIRL_ISLAND_SW warp_def $2d, $24, 1, WHIRL_ISLAND_SE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 35, 9, SIGNPOST_ITEM, Route41HiddenMaxEther + bg_event 35, 9, BGEVENT_ITEM, Route41HiddenMaxEther -.PersonEvents: +.ObjectEvents: db 10 - person_event SPRITE_OLIVINE_RIVAL, 6, 32, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1 - person_event SPRITE_OLIVINE_RIVAL, 8, 46, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1 - person_event SPRITE_OLIVINE_RIVAL, 26, 20, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermBerke, -1 - person_event SPRITE_OLIVINE_RIVAL, 30, 32, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermKirk, -1 - person_event SPRITE_OLIVINE_RIVAL, 46, 19, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermMathew, -1 - person_event SPRITE_SWIMMER_GIRL, 4, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfKaylee, -1 - person_event SPRITE_SWIMMER_GIRL, 19, 23, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfSusie, -1 - person_event SPRITE_SWIMMER_GIRL, 34, 27, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfDenise, -1 - person_event SPRITE_SWIMMER_GIRL, 28, 44, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 4, TrainerSwimmerfKara, -1 - person_event SPRITE_SWIMMER_GIRL, 50, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerSwimmerfWendy, -1 + object_event SPRITE_OLIVINE_RIVAL, 6, 32, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1 + object_event SPRITE_OLIVINE_RIVAL, 8, 46, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1 + object_event SPRITE_OLIVINE_RIVAL, 26, 20, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermBerke, -1 + object_event SPRITE_OLIVINE_RIVAL, 30, 32, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermKirk, -1 + object_event SPRITE_OLIVINE_RIVAL, 46, 19, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermMathew, -1 + object_event SPRITE_SWIMMER_GIRL, 4, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfKaylee, -1 + object_event SPRITE_SWIMMER_GIRL, 19, 23, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfSusie, -1 + object_event SPRITE_SWIMMER_GIRL, 34, 27, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDenise, -1 + object_event SPRITE_SWIMMER_GIRL, 28, 44, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfKara, -1 + object_event SPRITE_SWIMMER_GIRL, 50, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerSwimmerfWendy, -1 diff --git a/maps/Route42.asm b/maps/Route42.asm index eab7e282c..40feaa927 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -10,18 +10,18 @@ const_value set 2 const ROUTE42_SUICUNE Route42_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end Route42SuicuneScript: @@ -31,9 +31,9 @@ Route42SuicuneScript: applymovement ROUTE42_SUICUNE, MovementData_0x1a9356 disappear ROUTE42_SUICUNE pause 10 - dotrigger $0 + setscene $0 clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36 - domaptrigger ROUTE_36, $1 + setmapscene ROUTE_36, $1 end TrainerFisherTully1: @@ -331,26 +331,26 @@ Route42_MapEventHeader: warp_def $9, $1c, 2, MOUNT_MORTAR_1F_OUTSIDE warp_def $7, $2e, 3, MOUNT_MORTAR_1F_OUTSIDE -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 1, $e, $18, Route42SuicuneScript + coord_event 1, $e, $18, Route42SuicuneScript -.Signposts: +.BGEvents: db 5 - signpost 10, 4, SIGNPOST_READ, Route42Sign1 - signpost 5, 7, SIGNPOST_READ, MtMortarSign1 - signpost 9, 45, SIGNPOST_READ, MtMortarSign2 - signpost 8, 54, SIGNPOST_READ, Route42Sign2 - signpost 11, 16, SIGNPOST_ITEM, Route42HiddenMaxPotion + bg_event 10, 4, BGEVENT_READ, Route42Sign1 + bg_event 5, 7, BGEVENT_READ, MtMortarSign1 + bg_event 9, 45, BGEVENT_READ, MtMortarSign2 + bg_event 8, 54, BGEVENT_READ, Route42Sign2 + bg_event 11, 16, BGEVENT_ITEM, Route42HiddenMaxPotion -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_FISHER, 10, 40, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherTully1, -1 - person_event SPRITE_POKEFAN_M, 9, 51, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 - person_event SPRITE_SUPER_NERD, 8, 47, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 - person_event SPRITE_FRUIT_TREE, 16, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1 - person_event SPRITE_FRUIT_TREE, 16, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1 - person_event SPRITE_FRUIT_TREE, 16, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1 - person_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL - person_event SPRITE_POKE_BALL, 8, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION - person_event SPRITE_SUICUNE, 16, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 + object_event SPRITE_FISHER, 10, 40, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully1, -1 + object_event SPRITE_POKEFAN_M, 9, 51, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 + object_event SPRITE_SUPER_NERD, 8, 47, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 + object_event SPRITE_FRUIT_TREE, 16, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1 + object_event SPRITE_FRUIT_TREE, 16, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1 + object_event SPRITE_FRUIT_TREE, 16, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1 + object_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL + object_event SPRITE_POKE_BALL, 8, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION + object_event SPRITE_SUICUNE, 16, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index ae13507e7..b7cbf6c6f 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE42ECRUTEAKGATE_OFFICER Route42EcruteakGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -30,12 +30,12 @@ Route42EcruteakGate_MapEventHeader: warp_def $4, $9, 1, ROUTE_42 warp_def $5, $9, 2, ROUTE_42 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route42EcruteakGateOfficerScript, -1 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route42EcruteakGateOfficerScript, -1 diff --git a/maps/Route43.asm b/maps/Route43.asm index d3e16b3df..871cd133c 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -9,7 +9,7 @@ const_value set 2 const ROUTE43_POKE_BALL Route43_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -19,11 +19,11 @@ Route43_MapScriptHeader: .CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .NoRockets - domaptrigger ROUTE_43_GATE, $0 + setmapscene ROUTE_43_GATE, $0 return .NoRockets: - domaptrigger ROUTE_43_GATE, $1 + setmapscene ROUTE_43_GATE, $1 return TrainerCamperSpencer: @@ -512,22 +512,22 @@ Route43_MapEventHeader: warp_def $1f, $11, 1, ROUTE_43_GATE warp_def $1f, $12, 2, ROUTE_43_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 3, 13, SIGNPOST_READ, Route43Sign1 - signpost 49, 11, SIGNPOST_READ, Route43Sign2 - signpost 38, 16, SIGNPOST_READ, Route43TrainerTips + bg_event 3, 13, BGEVENT_READ, Route43Sign1 + bg_event 49, 11, BGEVENT_READ, Route43Sign2 + bg_event 38, 16, BGEVENT_READ, Route43TrainerTips -.PersonEvents: +.ObjectEvents: db 8 - person_event SPRITE_SUPER_NERD, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerPokemaniacBen, -1 - person_event SPRITE_SUPER_NERD, 20, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacBrent1, -1 - person_event SPRITE_SUPER_NERD, 7, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerPokemaniacRon, -1 - person_event SPRITE_FISHER, 16, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 4, TrainerFisherMarvin, -1 - person_event SPRITE_LASS, 25, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerPicnickerTiffany3, -1 - person_event SPRITE_YOUNGSTER, 40, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperSpencer, -1 - person_event SPRITE_FRUIT_TREE, 26, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1 - person_event SPRITE_POKE_BALL, 32, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER + object_event SPRITE_SUPER_NERD, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacBen, -1 + object_event SPRITE_SUPER_NERD, 20, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacBrent1, -1 + object_event SPRITE_SUPER_NERD, 7, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacRon, -1 + object_event SPRITE_FISHER, 16, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerFisherMarvin, -1 + object_event SPRITE_LASS, 25, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTiffany3, -1 + object_event SPRITE_YOUNGSTER, 40, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperSpencer, -1 + object_event SPRITE_FRUIT_TREE, 26, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1 + object_event SPRITE_POKE_BALL, 32, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 39d5c9273..7140528d6 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -4,10 +4,10 @@ const_value set 2 const ROUTE43GATE_ROCKET2 Route43Gate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .RocketShakedown - maptrigger .DummyTrigger + scene_script .RocketShakedown + scene_script .DummyScene .MapCallbacks: db 1 @@ -17,17 +17,17 @@ Route43Gate_MapScriptHeader: priorityjump .RocketTakeover end -.DummyTrigger: +.DummyScene: end .CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .NoRockets - domaptrigger ROUTE_43, $0 + setmapscene ROUTE_43, $0 return .NoRockets: - domaptrigger ROUTE_43, $1 + setmapscene ROUTE_43, $1 return .RocketTakeover: @@ -35,7 +35,7 @@ Route43Gate_MapScriptHeader: checkcode VAR_FACING if_equal DOWN, RocketScript_Southbound if_equal UP, RocketScript_Northbound - dotrigger $1 + setscene $1 end RocketScript_Southbound: @@ -67,7 +67,7 @@ RocketScript_ShakeDownSouth: closetext applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassSouth applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassSouth - dotrigger $1 + setscene $1 special RestartMapMusic end @@ -99,7 +99,7 @@ RocketScript_ShakeDownNorth: closetext applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassNorth applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassNorth - dotrigger $1 + setscene $1 special RestartMapMusic end @@ -256,14 +256,14 @@ Route43Gate_MapEventHeader: warp_def $7, $4, 3, ROUTE_43 warp_def $7, $5, 3, ROUTE_43 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS - person_event SPRITE_ROCKET, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS - person_event SPRITE_ROCKET, 4, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS + object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS + object_event SPRITE_ROCKET, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS + object_event SPRITE_ROCKET, 4, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index 37192979f..e4b6396c1 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE43MAHOGANYGATE_OFFICER Route43MahoganyGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -49,12 +49,12 @@ Route43MahoganyGate_MapEventHeader: warp_def $7, $4, 5, MAHOGANY_TOWN warp_def $7, $5, 5, MAHOGANY_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19ab0b, -1 + object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x19ab0b, -1 diff --git a/maps/Route44.asm b/maps/Route44.asm index 31c8a9c92..a12953ebc 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -12,7 +12,7 @@ const_value set 2 const ROUTE44_POKE_BALL3 Route44_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -515,25 +515,25 @@ Route44_MapEventHeader: db 1 warp_def $7, $38, 1, ICE_PATH_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 7, 53, SIGNPOST_READ, Route44Sign1 - signpost 10, 6, SIGNPOST_READ, Route44Sign2 - signpost 9, 32, SIGNPOST_ITEM, Route44HiddenElixer + bg_event 7, 53, BGEVENT_READ, Route44Sign1 + bg_event 10, 6, BGEVENT_READ, Route44Sign2 + bg_event 9, 32, BGEVENT_ITEM, Route44HiddenElixer -.PersonEvents: +.ObjectEvents: db 11 - person_event SPRITE_FISHER, 3, 35, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherWilton1, -1 - person_event SPRITE_FISHER, 13, 19, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherEdgar, -1 - person_event SPRITE_YOUNGSTER, 9, 10, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicPhil, -1 - person_event SPRITE_SUPER_NERD, 2, 43, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerPokemaniacZach, -1 - person_event SPRITE_YOUNGSTER, 5, 51, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerBird_keeperVance1, -1 - person_event SPRITE_COOLTRAINER_M, 15, 41, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1 - person_event SPRITE_COOLTRAINER_F, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1 - person_event SPRITE_FRUIT_TREE, 5, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1 - person_event SPRITE_POKE_BALL, 8, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE - person_event SPRITE_POKE_BALL, 4, 45, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL - person_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL + object_event SPRITE_FISHER, 3, 35, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherWilton1, -1 + object_event SPRITE_FISHER, 13, 19, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherEdgar, -1 + object_event SPRITE_YOUNGSTER, 9, 10, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1 + object_event SPRITE_SUPER_NERD, 2, 43, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacZach, -1 + object_event SPRITE_YOUNGSTER, 5, 51, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBird_keeperVance1, -1 + object_event SPRITE_COOLTRAINER_M, 15, 41, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1 + object_event SPRITE_COOLTRAINER_F, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1 + object_event SPRITE_FRUIT_TREE, 5, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1 + object_event SPRITE_POKE_BALL, 8, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE + object_event SPRITE_POKE_BALL, 4, 45, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL + object_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL diff --git a/maps/Route45.asm b/maps/Route45.asm index 7232e3494..592719890 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -14,7 +14,7 @@ const_value set 2 const ROUTE45_YOUNGSTER Route45_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -540,26 +540,26 @@ Route45_MapEventHeader: db 1 warp_def $5, $2, 1, DARK_CAVE_BLACKTHORN_ENTRANCE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 4, 10, SIGNPOST_READ, Route45Sign - signpost 80, 13, SIGNPOST_ITEM, Route45HiddenPpUp + bg_event 4, 10, BGEVENT_READ, Route45Sign + bg_event 80, 13, BGEVENT_ITEM, Route45HiddenPpUp -.PersonEvents: +.ObjectEvents: db 13 - person_event SPRITE_POKEFAN_M, 16, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 1, TrainerHikerErik, -1 - person_event SPRITE_POKEFAN_M, 65, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerMichael, -1 - person_event SPRITE_POKEFAN_M, 28, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerParry, -1 - person_event SPRITE_POKEFAN_M, 65, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 1, TrainerHikerTimothy, -1 - person_event SPRITE_BLACK_BELT, 50, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerBlackbeltKenji, -1 - person_event SPRITE_COOLTRAINER_M, 18, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainermRyan, -1 - person_event SPRITE_COOLTRAINER_F, 36, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1 - person_event SPRITE_FRUIT_TREE, 82, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19e294, -1 - person_event SPRITE_POKE_BALL, 51, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET - person_event SPRITE_POKE_BALL, 66, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE - person_event SPRITE_POKE_BALL, 20, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER - person_event SPRITE_POKE_BALL, 33, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION - person_event SPRITE_YOUNGSTER, 70, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19e269, -1 + object_event SPRITE_POKEFAN_M, 16, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerErik, -1 + object_event SPRITE_POKEFAN_M, 65, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerMichael, -1 + object_event SPRITE_POKEFAN_M, 28, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerParry, -1 + object_event SPRITE_POKEFAN_M, 65, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerTimothy, -1 + object_event SPRITE_BLACK_BELT, 50, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltKenji, -1 + object_event SPRITE_COOLTRAINER_M, 18, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermRyan, -1 + object_event SPRITE_COOLTRAINER_F, 36, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1 + object_event SPRITE_FRUIT_TREE, 82, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19e294, -1 + object_event SPRITE_POKE_BALL, 51, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET + object_event SPRITE_POKE_BALL, 66, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE + object_event SPRITE_POKE_BALL, 20, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER + object_event SPRITE_POKE_BALL, 33, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION + object_event SPRITE_YOUNGSTER, 70, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x19e269, -1 diff --git a/maps/Route46.asm b/maps/Route46.asm index e6c8d2cf2..89d6ac61e 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -7,7 +7,7 @@ const_value set 2 const ROUTE46_POKE_BALL Route46_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -260,18 +260,18 @@ Route46_MapEventHeader: warp_def $21, $8, 2, ROUTE_29_46_GATE warp_def $5, $e, 3, DARK_CAVE_VIOLET_ENTRANCE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 27, 9, SIGNPOST_READ, Route46Sign + bg_event 27, 9, BGEVENT_READ, Route46Sign -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_POKEFAN_M, 19, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerBailey, -1 - person_event SPRITE_YOUNGSTER, 14, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerCamperTed, -1 - person_event SPRITE_LASS, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerPicnickerErin1, -1 - person_event SPRITE_FRUIT_TREE, 5, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1 - person_event SPRITE_FRUIT_TREE, 6, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1 - person_event SPRITE_POKE_BALL, 15, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED + object_event SPRITE_POKEFAN_M, 19, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerBailey, -1 + object_event SPRITE_YOUNGSTER, 14, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1 + object_event SPRITE_LASS, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1 + object_event SPRITE_FRUIT_TREE, 5, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1 + object_event SPRITE_FRUIT_TREE, 6, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1 + object_event SPRITE_POKE_BALL, 15, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED diff --git a/maps/Route5.asm b/maps/Route5.asm index 734748f19..480b28cc1 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE5_POKEFAN_M Route5_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -50,14 +50,14 @@ Route5_MapEventHeader: warp_def $11, $9, 2, ROUTE_5_SAFFRON_CITY_GATE warp_def $b, $a, 1, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 17, 17, SIGNPOST_READ, Route5UndergroundPathSign - signpost 11, 10, SIGNPOST_READ, HouseForSaleSign + bg_event 17, 17, BGEVENT_READ, Route5UndergroundPathSign + bg_event 11, 10, BGEVENT_READ, HouseForSaleSign -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKEFAN_M, 16, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route5PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH + object_event SPRITE_POKEFAN_M, 16, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index 9736deb70..513adfac2 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE5CLEANSETAGSPEECHHOUSE_TEACHER Route5CleanseTagSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -69,15 +69,15 @@ Route5CleanseTagSpeechHouse_MapEventHeader: warp_def $7, $2, 4, ROUTE_5 warp_def $7, $3, 4, ROUTE_5 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, HouseForSaleBookshelf - signpost 1, 1, SIGNPOST_READ, HouseForSaleBookshelf + bg_event 1, 0, BGEVENT_READ, HouseForSaleBookshelf + bg_event 1, 1, BGEVENT_READ, HouseForSaleBookshelf -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_GRANNY, 5, 2, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GrannyScript_0x18b634, -1 - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route5CleanseTagSpeechHouseTeacherScript, -1 + object_event SPRITE_GRANNY, 5, 2, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x18b634, -1 + object_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagSpeechHouseTeacherScript, -1 diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm index c57c9e59e..ebd84823e 100644 --- a/maps/Route5SaffronCityGate.asm +++ b/maps/Route5SaffronCityGate.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE5SAFFRONCITYGATE_OFFICER Route5SaffronCityGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -31,12 +31,12 @@ Route5SaffronCityGate_MapEventHeader: warp_def $7, $4, 9, SAFFRON_CITY warp_def $7, $5, 9, SAFFRON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route5SaffronCityGateOfficerScript, -1 + object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronCityGateOfficerScript, -1 diff --git a/maps/Route5UndergroundEntrance.asm b/maps/Route5UndergroundEntrance.asm index dbbe22ad0..5692697fc 100644 --- a/maps/Route5UndergroundEntrance.asm +++ b/maps/Route5UndergroundEntrance.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE5UNDERGROUNDENTRANCE_TEACHER Route5UndergroundEntrance_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -29,12 +29,12 @@ Route5UndergroundEntrance_MapEventHeader: warp_def $7, $4, 1, ROUTE_5 warp_def $3, $4, 1, UNDERGROUND -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_TEACHER, 2, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route5UndergroundEntranceTeacherScript, -1 + object_event SPRITE_TEACHER, 2, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundEntranceTeacherScript, -1 diff --git a/maps/Route6.asm b/maps/Route6.asm index abf56e013..02b39d0fe 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE6_POKEFAN_M3 Route6_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -100,15 +100,15 @@ Route6_MapEventHeader: warp_def $3, $11, 1, ROUTE_6_UNDERGROUND_ENTRANCE warp_def $1, $6, 3, ROUTE_6_SAFFRON_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 5, 19, SIGNPOST_READ, Route6UndergroundPathSign + bg_event 5, 19, BGEVENT_READ, Route6UndergroundPathSign -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_POKEFAN_M, 4, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH - person_event SPRITE_POKEFAN_M, 12, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 0, TrainerPokefanmRex, -1 - person_event SPRITE_POKEFAN_M, 12, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 0, TrainerPokefanmAllan, -1 + object_event SPRITE_POKEFAN_M, 4, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH + object_event SPRITE_POKEFAN_M, 12, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmRex, -1 + object_event SPRITE_POKEFAN_M, 12, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmAllan, -1 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index bac8fb91c..25f234e82 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -2,14 +2,14 @@ const_value set 2 const ROUTE6SAFFRONGATE_OFFICER Route6SaffronGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - maptrigger .DummyTrigger + scene_script .DummyScene .MapCallbacks: db 0 -.DummyTrigger: +.DummyScene: end OfficerScript_0x1926ea: @@ -68,12 +68,12 @@ Route6SaffronGate_MapEventHeader: warp_def $7, $4, 2, ROUTE_6 warp_def $7, $5, 2, ROUTE_6 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x1926ea, -1 + object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1926ea, -1 diff --git a/maps/Route6UndergroundEntrance.asm b/maps/Route6UndergroundEntrance.asm index e1dbd1b86..e84ecc90d 100644 --- a/maps/Route6UndergroundEntrance.asm +++ b/maps/Route6UndergroundEntrance.asm @@ -1,5 +1,5 @@ Route6UndergroundEntrance_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -15,11 +15,11 @@ Route6UndergroundEntrance_MapEventHeader: warp_def $7, $4, 1, ROUTE_6 warp_def $3, $4, 2, UNDERGROUND -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/Route7.asm b/maps/Route7.asm index 1b56ea3cf..c412b4a46 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -1,5 +1,5 @@ Route7_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -43,13 +43,13 @@ Route7_MapEventHeader: warp_def $6, $f, 1, ROUTE_7_SAFFRON_GATE warp_def $7, $f, 2, ROUTE_7_SAFFRON_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 11, 5, SIGNPOST_READ, Route7UndergroundPathSign - signpost 9, 6, SIGNPOST_READ, Route7LockedDoor + bg_event 11, 5, BGEVENT_READ, Route7UndergroundPathSign + bg_event 9, 6, BGEVENT_READ, Route7LockedDoor -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index b5f0704ca..1b5a02785 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE7SAFFRONGATE_OFFICER Route7SaffronGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -56,12 +56,12 @@ Route7SaffronGate_MapEventHeader: warp_def $4, $9, 10, SAFFRON_CITY warp_def $5, $9, 11, SAFFRON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x73518, -1 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x73518, -1 diff --git a/maps/Route8.asm b/maps/Route8.asm index 33e97f0e7..66a207130 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -7,7 +7,7 @@ const_value set 2 const ROUTE8_FRUIT_TREE Route8_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -181,19 +181,19 @@ Route8_MapEventHeader: warp_def $4, $4, 3, ROUTE_8_SAFFRON_GATE warp_def $5, $4, 4, ROUTE_8_SAFFRON_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 7, 11, SIGNPOST_READ, Route8UndergroundPathSign - signpost 5, 10, SIGNPOST_READ, Route8LockedDoor + bg_event 7, 11, BGEVENT_READ, Route8UndergroundPathSign + bg_event 5, 10, BGEVENT_READ, Route8LockedDoor -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_BIKER, 8, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 5, TrainerBikerDwayne, -1 - person_event SPRITE_BIKER, 9, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 5, TrainerBikerHarris, -1 - person_event SPRITE_BIKER, 10, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 5, TrainerBikerZeke, -1 - person_event SPRITE_SUPER_NERD, 2, 23, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerSupernerdSam, -1 - person_event SPRITE_SUPER_NERD, 12, 31, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 4, TrainerSupernerdTom, -1 - person_event SPRITE_FRUIT_TREE, 5, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1 + object_event SPRITE_BIKER, 8, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerBikerDwayne, -1 + object_event SPRITE_BIKER, 9, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1 + object_event SPRITE_BIKER, 10, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBikerZeke, -1 + object_event SPRITE_SUPER_NERD, 2, 23, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdSam, -1 + object_event SPRITE_SUPER_NERD, 12, 31, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSupernerdTom, -1 + object_event SPRITE_FRUIT_TREE, 5, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index 44908079f..5fc04c8ad 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE8SAFFRONGATE_OFFICER Route8SaffronGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -30,12 +30,12 @@ Route8SaffronGate_MapEventHeader: warp_def $4, $9, 1, ROUTE_8 warp_def $5, $9, 2, ROUTE_8 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route8SaffronGateOfficerScript, -1 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route8SaffronGateOfficerScript, -1 diff --git a/maps/Route9.asm b/maps/Route9.asm index e41f0efd6..d3a28a088 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -7,7 +7,7 @@ const_value set 2 const ROUTE9_POKEFAN_M2 Route9_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -214,19 +214,19 @@ Route9_MapEventHeader: db 1 warp_def $f, $30, 1, ROCK_TUNNEL_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 7, 15, SIGNPOST_READ, Route9Sign - signpost 15, 41, SIGNPOST_ITEM, Route9HiddenEther + bg_event 7, 15, BGEVENT_READ, Route9Sign + bg_event 15, 41, BGEVENT_ITEM, Route9HiddenEther -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_YOUNGSTER, 11, 23, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperDean, -1 - person_event SPRITE_LASS, 8, 39, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1 - person_event SPRITE_YOUNGSTER, 4, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 5, TrainerCamperSid, -1 - person_event SPRITE_LASS, 15, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerEdna, -1 - person_event SPRITE_POKEFAN_M, 3, 28, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerTim, -1 - person_event SPRITE_POKEFAN_M, 15, 36, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 4, TrainerHikerSidney, -1 + object_event SPRITE_YOUNGSTER, 11, 23, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperDean, -1 + object_event SPRITE_LASS, 8, 39, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1 + object_event SPRITE_YOUNGSTER, 4, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperSid, -1 + object_event SPRITE_LASS, 15, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerEdna, -1 + object_event SPRITE_POKEFAN_M, 3, 28, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerTim, -1 + object_event SPRITE_POKEFAN_M, 15, 36, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerHikerSidney, -1 diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index d6e6bc0d8..bf84025fe 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -1,8 +1,8 @@ RuinsOfAlphAerodactylChamber_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .CheckWall - maptrigger .DummyTrigger + scene_script .CheckWall + scene_script .DummyScene .MapCallbacks: db 1 @@ -17,7 +17,7 @@ RuinsOfAlphAerodactylChamber_MapScriptHeader: priorityjump .WallOpenScript end -.DummyTrigger: +.DummyScene: end .HiddenDoors: @@ -43,7 +43,7 @@ RuinsOfAlphAerodactylChamber_MapScriptHeader: changeblock $4, $0, $30 reloadmappart earthquake 50 - dotrigger $1 + setscene $1 closetext end @@ -59,7 +59,7 @@ UnknownScript_0x58df7: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_AERODACTYL_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_3 - domaptrigger RUINS_OF_ALPH_INNER_CHAMBER, $1 + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 changeblock $2, $2, $18 @@ -155,17 +155,17 @@ RuinsOfAlphAerodactylChamber_MapEventHeader: warp_def $3, $4, 9, RUINS_OF_ALPH_INNER_CHAMBER warp_def $0, $4, 1, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 3, 2, SIGNPOST_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script - signpost 3, 5, SIGNPOST_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script - signpost 2, 3, SIGNPOST_UP, MapRuinsOfAlphAerodactylChamberSignpost2Script - signpost 2, 4, SIGNPOST_UP, MapRuinsOfAlphAerodactylChamberSignpost3Script - signpost 0, 3, SIGNPOST_UP, MapRuinsOfAlphAerodactylChamberSignpost4Script - signpost 0, 4, SIGNPOST_UP, MapRuinsOfAlphAerodactylChamberSignpost5Script + bg_event 3, 2, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script + bg_event 3, 5, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script + bg_event 2, 3, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost2Script + bg_event 2, 4, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost3Script + bg_event 0, 3, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost4Script + bg_event 0, 4, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost5Script -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm index 737249e1c..56197802b 100644 --- a/maps/RuinsOfAlphAerodactylItemRoom.asm +++ b/maps/RuinsOfAlphAerodactylItemRoom.asm @@ -5,7 +5,7 @@ const_value set 2 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL4 RuinsOfAlphAerodactylItemRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -43,17 +43,17 @@ RuinsOfAlphAerodactylItemRoom_MapEventHeader: warp_def $1, $3, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM warp_def $1, $4, 2, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 2, SIGNPOST_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script - signpost 1, 5, SIGNPOST_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script + bg_event 1, 2, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script + bg_event 1, 5, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM - person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM + object_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM + object_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM + object_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM + object_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM diff --git a/maps/RuinsOfAlphAerodactylWordRoom.asm b/maps/RuinsOfAlphAerodactylWordRoom.asm index 5178a960a..c31cc563b 100644 --- a/maps/RuinsOfAlphAerodactylWordRoom.asm +++ b/maps/RuinsOfAlphAerodactylWordRoom.asm @@ -1,5 +1,5 @@ RuinsOfAlphAerodactylWordRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -15,11 +15,11 @@ RuinsOfAlphAerodactylWordRoom_MapEventHeader: warp_def $5, $a, 4, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM warp_def $b, $11, 8, RUINS_OF_ALPH_INNER_CHAMBER -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 2ff478945..ec334e397 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -1,8 +1,8 @@ RuinsOfAlphHoOhChamber_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .CheckWall - maptrigger .DummyTrigger + scene_script .CheckWall + scene_script .DummyScene .MapCallbacks: db 1 @@ -18,7 +18,7 @@ RuinsOfAlphHoOhChamber_MapScriptHeader: priorityjump .WallOpenScript end -.DummyTrigger: +.DummyScene: end .HiddenDoors: @@ -44,7 +44,7 @@ RuinsOfAlphHoOhChamber_MapScriptHeader: changeblock $4, $0, $30 reloadmappart earthquake 50 - dotrigger $1 + setscene $1 closetext end @@ -60,7 +60,7 @@ UnknownScript_0x585ba: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_HO_OH_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_4 - domaptrigger RUINS_OF_ALPH_INNER_CHAMBER, $1 + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 changeblock $2, $2, $18 @@ -156,17 +156,17 @@ RuinsOfAlphHoOhChamber_MapEventHeader: warp_def $3, $4, 3, RUINS_OF_ALPH_INNER_CHAMBER warp_def $0, $4, 1, RUINS_OF_ALPH_HO_OH_ITEM_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 3, 2, SIGNPOST_READ, MapRuinsOfAlphHoOhChamberSignpost1Script - signpost 3, 5, SIGNPOST_READ, MapRuinsOfAlphHoOhChamberSignpost1Script - signpost 2, 3, SIGNPOST_UP, MapRuinsOfAlphHoOhChamberSignpost2Script - signpost 2, 4, SIGNPOST_UP, MapRuinsOfAlphHoOhChamberSignpost3Script - signpost 0, 3, SIGNPOST_UP, MapRuinsOfAlphHoOhChamberSignpost4Script - signpost 0, 4, SIGNPOST_UP, MapRuinsOfAlphHoOhChamberSignpost5Script + bg_event 3, 2, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script + bg_event 3, 5, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script + bg_event 2, 3, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost2Script + bg_event 2, 4, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost3Script + bg_event 0, 3, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost4Script + bg_event 0, 4, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost5Script -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm index 0fe47d4b7..643dde195 100644 --- a/maps/RuinsOfAlphHoOhItemRoom.asm +++ b/maps/RuinsOfAlphHoOhItemRoom.asm @@ -5,7 +5,7 @@ const_value set 2 const RUINSOFALPHHOOHITEMROOM_POKE_BALL4 RuinsOfAlphHoOhItemRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -43,17 +43,17 @@ RuinsOfAlphHoOhItemRoom_MapEventHeader: warp_def $1, $3, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM warp_def $1, $4, 2, RUINS_OF_ALPH_HO_OH_WORD_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 2, SIGNPOST_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script - signpost 1, 5, SIGNPOST_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script + bg_event 1, 2, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script + bg_event 1, 5, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM - person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM + object_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM + object_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM + object_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM + object_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM diff --git a/maps/RuinsOfAlphHoOhWordRoom.asm b/maps/RuinsOfAlphHoOhWordRoom.asm index 6db528779..059025e6b 100644 --- a/maps/RuinsOfAlphHoOhWordRoom.asm +++ b/maps/RuinsOfAlphHoOhWordRoom.asm @@ -1,5 +1,5 @@ RuinsOfAlphHoOhWordRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -15,11 +15,11 @@ RuinsOfAlphHoOhWordRoom_MapEventHeader: warp_def $9, $a, 4, RUINS_OF_ALPH_HO_OH_ITEM_ROOM warp_def $15, $11, 2, RUINS_OF_ALPH_INNER_CHAMBER -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index 791a6deeb..5fa6714a5 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -4,15 +4,15 @@ const_value set 2 const RUINSOFALPHINNERCHAMBER_GRAMPS RuinsOfAlphInnerChamber_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .UnownAppear + scene_script .DummyScene0 + scene_script .UnownAppear .MapCallbacks: db 0 -.DummyTrigger0: +.DummyScene0: end .UnownAppear: @@ -24,7 +24,7 @@ RuinsOfAlphInnerChamber_MapScriptHeader: writetext RuinsOfAlphStrangePresenceText waitbutton closetext - dotrigger $0 + setscene $0 setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER end @@ -92,40 +92,40 @@ RuinsOfAlphInnerChamber_MapEventHeader: warp_def $18, $f, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER warp_def $18, $10, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 26 - signpost 3, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 3, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 3, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 3, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 3, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 3, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 8, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 8, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 8, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 8, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 8, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 8, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 13, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 13, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 18, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 18, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 18, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 18, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 18, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 18, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 24, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 24, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 24, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 24, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 24, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue - signpost 24, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + bg_event 3, 2, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 3, 5, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 3, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 3, 11, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 3, 14, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 3, 17, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 2, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 5, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 11, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 14, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 17, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 13, 2, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 13, 17, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 18, 2, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 18, 5, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 18, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 18, 11, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 18, 14, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 18, 17, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 24, 2, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 24, 5, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 24, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 24, 11, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 24, 14, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 24, 17, BGEVENT_READ, RuinsOfAlphInnerChamberStatue -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_FISHER, 7, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS - person_event SPRITE_TEACHER, 13, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberTeacherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS - person_event SPRITE_GRAMPS, 19, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + object_event SPRITE_FISHER, 7, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + object_event SPRITE_TEACHER, 13, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberTeacherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + object_event SPRITE_GRAMPS, 19, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index d70ce63b2..15a9e90c4 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -3,10 +3,10 @@ const_value set 2 const RUINSOFALPHKABUTOCHAMBER_SCIENTIST RuinsOfAlphKabutoChamber_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .CheckWall - maptrigger .DummyTrigger + scene_script .CheckWall + scene_script .DummyScene .MapCallbacks: db 1 @@ -21,7 +21,7 @@ RuinsOfAlphKabutoChamber_MapScriptHeader: priorityjump .WallOpenScript end -.DummyTrigger: +.DummyScene: end .HiddenDoors: @@ -47,7 +47,7 @@ RuinsOfAlphKabutoChamber_MapScriptHeader: changeblock $4, $0, $30 reloadmappart earthquake 50 - dotrigger $1 + setscene $1 closetext end @@ -67,7 +67,7 @@ UnknownScript_0x58778: setevent EVENT_SOLVED_KABUTO_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_1 setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST - domaptrigger RUINS_OF_ALPH_INNER_CHAMBER, $1 + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 changeblock $2, $2, $18 @@ -267,19 +267,19 @@ RuinsOfAlphKabutoChamber_MapEventHeader: warp_def $3, $4, 5, RUINS_OF_ALPH_INNER_CHAMBER warp_def $0, $4, 1, RUINS_OF_ALPH_KABUTO_ITEM_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 3, 2, SIGNPOST_READ, MapRuinsOfAlphKabutoChamberSignpost1Script - signpost 3, 5, SIGNPOST_READ, MapRuinsOfAlphKabutoChamberSignpost1Script - signpost 2, 3, SIGNPOST_UP, MapRuinsOfAlphKabutoChamberSignpost2Script - signpost 2, 4, SIGNPOST_UP, MapRuinsOfAlphKabutoChamberSignpost3Script - signpost 0, 3, SIGNPOST_UP, MapRuinsOfAlphKabutoChamberSignpost4Script - signpost 0, 4, SIGNPOST_UP, MapRuinsOfAlphKabutoChamberSignpost5Script + bg_event 3, 2, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script + bg_event 3, 5, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script + bg_event 2, 3, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost2Script + bg_event 2, 4, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost3Script + bg_event 0, 3, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost4Script + bg_event 0, 4, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost5Script -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_RECEPTIONIST, 5, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST - person_event SPRITE_SCIENTIST, 1, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1 + object_event SPRITE_RECEPTIONIST, 5, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST + object_event SPRITE_SCIENTIST, 1, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1 diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm index 2126b4ff3..45afbcc45 100644 --- a/maps/RuinsOfAlphKabutoItemRoom.asm +++ b/maps/RuinsOfAlphKabutoItemRoom.asm @@ -5,7 +5,7 @@ const_value set 2 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL4 RuinsOfAlphKabutoItemRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -43,17 +43,17 @@ RuinsOfAlphKabutoItemRoom_MapEventHeader: warp_def $1, $3, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM warp_def $1, $4, 2, RUINS_OF_ALPH_KABUTO_WORD_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 2, SIGNPOST_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script - signpost 1, 5, SIGNPOST_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script + bg_event 1, 2, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script + bg_event 1, 5, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM - person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM + object_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM + object_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM + object_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM + object_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM diff --git a/maps/RuinsOfAlphKabutoWordRoom.asm b/maps/RuinsOfAlphKabutoWordRoom.asm index b212dde21..f872baedb 100644 --- a/maps/RuinsOfAlphKabutoWordRoom.asm +++ b/maps/RuinsOfAlphKabutoWordRoom.asm @@ -1,5 +1,5 @@ RuinsOfAlphKabutoWordRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -15,11 +15,11 @@ RuinsOfAlphKabutoWordRoom_MapEventHeader: warp_def $5, $a, 4, RUINS_OF_ALPH_KABUTO_ITEM_ROOM warp_def $b, $11, 4, RUINS_OF_ALPH_INNER_CHAMBER -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index fbf806070..80ad32c32 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -1,8 +1,8 @@ RuinsOfAlphOmanyteChamber_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .CheckWall - maptrigger .DummyTrigger + scene_script .CheckWall + scene_script .DummyScene .MapCallbacks: db 1 @@ -18,7 +18,7 @@ RuinsOfAlphOmanyteChamber_MapScriptHeader: priorityjump .WallOpenScript end -.DummyTrigger: +.DummyScene: end .HiddenDoors: @@ -44,7 +44,7 @@ RuinsOfAlphOmanyteChamber_MapScriptHeader: changeblock $4, $0, $30 reloadmappart earthquake 50 - dotrigger $1 + setscene $1 closetext end @@ -60,7 +60,7 @@ UnknownScript_0x58c36: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_OMANYTE_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_2 - domaptrigger RUINS_OF_ALPH_INNER_CHAMBER, $1 + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 changeblock $2, $2, $18 @@ -156,17 +156,17 @@ RuinsOfAlphOmanyteChamber_MapEventHeader: warp_def $3, $4, 7, RUINS_OF_ALPH_INNER_CHAMBER warp_def $0, $4, 1, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 3, 2, SIGNPOST_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script - signpost 3, 5, SIGNPOST_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script - signpost 2, 3, SIGNPOST_UP, MapRuinsOfAlphOmanyteChamberSignpost2Script - signpost 2, 4, SIGNPOST_UP, MapRuinsOfAlphOmanyteChamberSignpost3Script - signpost 0, 3, SIGNPOST_UP, MapRuinsOfAlphOmanyteChamberSignpost4Script - signpost 0, 4, SIGNPOST_UP, MapRuinsOfAlphOmanyteChamberSignpost5Script + bg_event 3, 2, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script + bg_event 3, 5, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script + bg_event 2, 3, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost2Script + bg_event 2, 4, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost3Script + bg_event 0, 3, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost4Script + bg_event 0, 4, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost5Script -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm index df5db803b..0f3eb7e16 100644 --- a/maps/RuinsOfAlphOmanyteItemRoom.asm +++ b/maps/RuinsOfAlphOmanyteItemRoom.asm @@ -5,7 +5,7 @@ const_value set 2 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL4 RuinsOfAlphOmanyteItemRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -43,17 +43,17 @@ RuinsOfAlphOmanyteItemRoom_MapEventHeader: warp_def $1, $3, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM warp_def $1, $4, 2, RUINS_OF_ALPH_OMANYTE_WORD_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 2, SIGNPOST_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script - signpost 1, 5, SIGNPOST_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script + bg_event 1, 2, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script + bg_event 1, 5, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM - person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM + object_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM + object_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM + object_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM + object_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM diff --git a/maps/RuinsOfAlphOmanyteWordRoom.asm b/maps/RuinsOfAlphOmanyteWordRoom.asm index 634ac16a1..205e7575d 100644 --- a/maps/RuinsOfAlphOmanyteWordRoom.asm +++ b/maps/RuinsOfAlphOmanyteWordRoom.asm @@ -1,5 +1,5 @@ RuinsOfAlphOmanyteWordRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -15,11 +15,11 @@ RuinsOfAlphOmanyteWordRoom_MapEventHeader: warp_def $7, $a, 4, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM warp_def $d, $11, 6, RUINS_OF_ALPH_INNER_CHAMBER -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 687133219..8e6ecf49b 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -6,19 +6,19 @@ const_value set 2 const RUINSOFALPHOUTSIDE_YOUNGSTER3 RuinsOfAlphOutside_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 dbw MAPCALLBACK_OBJECTS, .ScientistCallback -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end .ScientistCallback: @@ -35,20 +35,20 @@ RuinsOfAlphOutside_MapScriptHeader: .YesScientist: appear RUINSOFALPHOUTSIDE_SCIENTIST - dotrigger $1 + setscene $1 return .NoScientist: disappear RUINSOFALPHOUTSIDE_SCIENTIST - dotrigger $0 + setscene $0 return -RuinsOfAlphOutsideScientistTrigger1: +RuinsOfAlphOutsideScientistScene1: spriteface RUINSOFALPHOUTSIDE_SCIENTIST, UP spriteface PLAYER, DOWN jump UnknownScript_0x58044 -RuinsOfAlphOutsideScientistTrigger2: +RuinsOfAlphOutsideScientistScene2: spriteface RUINSOFALPHOUTSIDE_SCIENTIST, LEFT spriteface PLAYER, RIGHT jump UnknownScript_0x58044 @@ -66,7 +66,7 @@ UnknownScript_0x58044: disappear RUINSOFALPHOUTSIDE_SCIENTIST stopfollow applymovement PLAYER, MovementData_0x580c5 - domaptrigger RUINS_OF_ALPH_RESEARCH_CENTER, $1 + setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, $1 warpcheck end @@ -300,21 +300,21 @@ RuinsOfAlphOutside_MapEventHeader: warp_def $14, $d, 1, ROUTE_32_RUINS_OF_ALPH_GATE warp_def $15, $d, 2, ROUTE_32_RUINS_OF_ALPH_GATE -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 1, $e, $b, RuinsOfAlphOutsideScientistTrigger1 - xy_trigger 1, $f, $a, RuinsOfAlphOutsideScientistTrigger2 + coord_event 1, $e, $b, RuinsOfAlphOutsideScientistScene1 + coord_event 1, $f, $a, RuinsOfAlphOutsideScientistScene2 -.Signposts: +.BGEvents: db 3 - signpost 8, 16, SIGNPOST_READ, RuinsOfAlphOutsideSignpost0Script - signpost 16, 12, SIGNPOST_READ, RuinsOfAlphOutsideSignpost1Script - signpost 12, 18, SIGNPOST_READ, RuinsOfAlphOutsideSignpost2Script + bg_event 8, 16, BGEVENT_READ, RuinsOfAlphOutsideSignpost0Script + bg_event 16, 12, BGEVENT_READ, RuinsOfAlphOutsideSignpost1Script + bg_event 12, 18, BGEVENT_READ, RuinsOfAlphOutsideSignpost2Script -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_YOUNGSTER, 20, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 1, TrainerPsychicNathan, -1 - person_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST - person_event SPRITE_FISHER, 17, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER - person_event SPRITE_YOUNGSTER, 11, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS - person_event SPRITE_YOUNGSTER, 8, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS + object_event SPRITE_YOUNGSTER, 20, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPsychicNathan, -1 + object_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST + object_event SPRITE_FISHER, 17, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER + object_event SPRITE_YOUNGSTER, 11, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS + object_event SPRITE_YOUNGSTER, 8, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 36e60a437..f4b62563a 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -4,16 +4,16 @@ const_value set 2 const RUINSOFALPHRESEARCHCENTER_SCIENTIST3 RuinsOfAlphResearchCenter_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .GetUnownDex + scene_script .DummyScene0 + scene_script .GetUnownDex .MapCallbacks: db 1 dbw MAPCALLBACK_OBJECTS, .ScientistCallback -.DummyTrigger0: +.DummyScene0: end .GetUnownDex: @@ -21,12 +21,12 @@ RuinsOfAlphResearchCenter_MapScriptHeader: end .ScientistCallback: - checktriggers + checkscene if_equal $1, .ShowScientist return .ShowScientist: - moveperson RUINSOFALPHRESEARCHCENTER_SCIENTIST3, $3, $7 + moveobject RUINSOFALPHRESEARCHCENTER_SCIENTIST3, $3, $7 appear RUINSOFALPHRESEARCHCENTER_SCIENTIST3 return @@ -55,7 +55,7 @@ RuinsOfAlphResearchCenter_MapScriptHeader: waitbutton closetext applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59276 - dotrigger $0 + setscene $0 special RestartMapMusic end @@ -401,17 +401,17 @@ RuinsOfAlphResearchCenter_MapEventHeader: warp_def $7, $2, 6, RUINS_OF_ALPH_OUTSIDE warp_def $7, $3, 6, RUINS_OF_ALPH_OUTSIDE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 5, 6, SIGNPOST_READ, MapRuinsOfAlphResearchCenterSignpost0Script - signpost 4, 3, SIGNPOST_READ, MapRuinsOfAlphResearchCenterSignpost1Script - signpost 1, 7, SIGNPOST_READ, MapRuinsOfAlphResearchCenterSignpost2Script + bg_event 5, 6, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost0Script + bg_event 4, 3, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost1Script + bg_event 1, 7, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost2Script -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_SCIENTIST, 5, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1 - person_event SPRITE_SCIENTIST, 2, 5, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x59214, -1 - person_event SPRITE_SCIENTIST, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST + object_event SPRITE_SCIENTIST, 5, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1 + object_event SPRITE_SCIENTIST, 2, 5, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x59214, -1 + object_event SPRITE_SCIENTIST, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index 2f5fbe2ab..77e40f8e2 100644 --- a/maps/SafariZoneBeta.asm +++ b/maps/SafariZoneBeta.asm @@ -1,5 +1,5 @@ SafariZoneBeta_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -14,11 +14,11 @@ SafariZoneBeta_MapEventHeader: warp_def $17, $9, 1, SAFARI_ZONE_FUCHSIA_GATE_BETA warp_def $17, $a, 2, SAFARI_ZONE_FUCHSIA_GATE_BETA -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index 60b24d4e1..0ffc13b75 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -1,5 +1,5 @@ SafariZoneFuchsiaGateBeta_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -16,11 +16,11 @@ SafariZoneFuchsiaGateBeta_MapEventHeader: warp_def $7, $4, 7, FUCHSIA_CITY warp_def $7, $5, 7, FUCHSIA_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index a116519ba..1fd5e0b55 100644 --- a/maps/SafariZoneMainOffice.asm +++ b/maps/SafariZoneMainOffice.asm @@ -1,5 +1,5 @@ SafariZoneMainOffice_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -14,11 +14,11 @@ SafariZoneMainOffice_MapEventHeader: warp_def $7, $2, 2, FUCHSIA_CITY warp_def $7, $3, 2, FUCHSIA_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 403967b01..f1c768e33 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -2,7 +2,7 @@ const_value set 2 const SAFARIZONEWARDENSHOME_LASS SafariZoneWardensHome_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -85,16 +85,16 @@ SafariZoneWardensHome_MapEventHeader: warp_def $7, $2, 6, FUCHSIA_CITY warp_def $7, $3, 6, FUCHSIA_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 1, 0, SIGNPOST_READ, WardensHomeBookshelf - signpost 1, 1, SIGNPOST_READ, WardensHomeBookshelf - signpost 0, 7, SIGNPOST_READ, WardenPhoto - signpost 0, 9, SIGNPOST_READ, SafariZonePhoto + bg_event 1, 0, BGEVENT_READ, WardensHomeBookshelf + bg_event 1, 1, BGEVENT_READ, WardensHomeBookshelf + bg_event 0, 7, BGEVENT_READ, WardenPhoto + bg_event 0, 9, BGEVENT_READ, SafariZonePhoto -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_LASS, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, WardensGranddaughter, -1 + object_event SPRITE_LASS, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, WardensGranddaughter, -1 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 7613c17a3..14334d12d 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -9,7 +9,7 @@ const_value set 2 const SAFFRONCITY_LASS2 SaffronCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -287,27 +287,27 @@ SaffronCity_MapEventHeader: warp_def $16, $27, 1, ROUTE_8_SAFFRON_GATE warp_def $17, $27, 2, ROUTE_8_SAFFRON_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 8 - signpost 5, 21, SIGNPOST_READ, SaffronCitySign - signpost 5, 33, SIGNPOST_READ, SaffronGymSign - signpost 5, 25, SIGNPOST_READ, FightingDojoSign - signpost 21, 15, SIGNPOST_READ, SilphCoSign - signpost 29, 25, SIGNPOST_READ, MrPsychicsHouseSign - signpost 5, 11, SIGNPOST_READ, SaffronCityMagnetTrainStationSign - signpost 29, 10, SIGNPOST_READ, SaffronCityPokecenterSign - signpost 11, 26, SIGNPOST_READ, SaffronCityMartSign + bg_event 5, 21, BGEVENT_READ, SaffronCitySign + bg_event 5, 33, BGEVENT_READ, SaffronGymSign + bg_event 5, 25, BGEVENT_READ, FightingDojoSign + bg_event 21, 15, BGEVENT_READ, SilphCoSign + bg_event 29, 25, BGEVENT_READ, MrPsychicsHouseSign + bg_event 5, 11, BGEVENT_READ, SaffronCityMagnetTrainStationSign + bg_event 29, 10, BGEVENT_READ, SaffronCityPokecenterSign + bg_event 11, 26, BGEVENT_READ, SaffronCityMartSign -.PersonEvents: +.ObjectEvents: db 8 - person_event SPRITE_LASS, 14, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LassScript_0x19932a, -1 - person_event SPRITE_POKEFAN_M, 30, 19, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x19933e, -1 - person_event SPRITE_COOLTRAINER_M, 7, 32, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1 - person_event SPRITE_COOLTRAINER_F, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SaffronCityCooltrainerFScript, -1 - person_event SPRITE_FISHER, 12, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x199358, -1 - person_event SPRITE_YOUNGSTER, 19, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SaffronCityYoungster1Script, -1 - person_event SPRITE_YOUNGSTER, 22, 35, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SaffronCityYoungster2Script, -1 - person_event SPRITE_LASS, 8, 19, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SaffronCityLassScript, -1 + object_event SPRITE_LASS, 14, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LassScript_0x19932a, -1 + object_event SPRITE_POKEFAN_M, 30, 19, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19933e, -1 + object_event SPRITE_COOLTRAINER_M, 7, 32, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1 + object_event SPRITE_COOLTRAINER_F, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerFScript, -1 + object_event SPRITE_FISHER, 12, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x199358, -1 + object_event SPRITE_YOUNGSTER, 19, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster1Script, -1 + object_event SPRITE_YOUNGSTER, 22, 35, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster2Script, -1 + object_event SPRITE_LASS, 8, 19, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityLassScript, -1 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 0e4385b83..a780ef4da 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -7,7 +7,7 @@ const_value set 2 const SAFFRONGYM_GYM_GUY SaffronGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -329,18 +329,18 @@ SaffronGym_MapEventHeader: warp_def $3, $1, 16, SAFFRON_GYM warp_def $9, $b, 17, SAFFRON_GYM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 15, 8, SIGNPOST_READ, SaffronGymStatue + bg_event 15, 8, BGEVENT_READ, SaffronGymStatue -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_SABRINA, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1 - person_event SPRITE_GRANNY, 16, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerMediumRebecca, -1 - person_event SPRITE_YOUNGSTER, 16, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicFranklin, -1 - person_event SPRITE_GRANNY, 4, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerMediumDoris, -1 - person_event SPRITE_YOUNGSTER, 4, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerPsychicJared, -1 - person_event SPRITE_GYM_GUY, 14, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SaffronGymGuyScript, -1 + object_event SPRITE_SABRINA, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1 + object_event SPRITE_GRANNY, 16, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerMediumRebecca, -1 + object_event SPRITE_YOUNGSTER, 16, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1 + object_event SPRITE_GRANNY, 4, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumDoris, -1 + object_event SPRITE_YOUNGSTER, 4, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicJared, -1 + object_event SPRITE_GYM_GUY, 14, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronGymGuyScript, -1 diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index edef6f75c..c1ce96b4f 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -4,7 +4,7 @@ const_value set 2 const SAFFRONMART_COOLTRAINER_F SaffronMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -46,14 +46,14 @@ SaffronMart_MapEventHeader: warp_def $7, $2, 3, SAFFRON_CITY warp_def $7, $3, 3, SAFFRON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1 - person_event SPRITE_COOLTRAINER_M, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1 - person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1 + object_event SPRITE_COOLTRAINER_M, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1 + object_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1 diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index dfa0494d7..9b4608e7b 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const SAFFRONPOKECENTER1F_YOUNGSTER SaffronPokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -121,15 +121,15 @@ SaffronPokecenter1F_MapEventHeader: warp_def $7, $4, 4, SAFFRON_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1 - person_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1 - person_event SPRITE_FISHER, 6, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1 - person_event SPRITE_YOUNGSTER, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SaffronPokecenter1FYoungsterScript, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1 + object_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1 + object_event SPRITE_FISHER, 6, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1 + object_event SPRITE_YOUNGSTER, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FYoungsterScript, -1 diff --git a/maps/SaffronPokecenter2FBeta.asm b/maps/SaffronPokecenter2FBeta.asm index 3c1381ba6..ea6adcb2f 100644 --- a/maps/SaffronPokecenter2FBeta.asm +++ b/maps/SaffronPokecenter2FBeta.asm @@ -1,5 +1,5 @@ SaffronPokecenter2FBeta_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -13,11 +13,11 @@ SaffronPokecenter2FBeta_MapEventHeader: db 1 warp_def $7, $0, 3, SAFFRON_POKECENTER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index bfe878439..df7d7c6de 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -5,14 +5,14 @@ const_value set 2 const SAFFRONTRAINSTATION_LASS SaffronTrainStation_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - maptrigger .DummyTrigger + scene_script .DummyScene .MapCallbacks: db 0 -.DummyTrigger: +.DummyScene: end OfficerScript_0x18a81e: @@ -226,16 +226,16 @@ SaffronTrainStation_MapEventHeader: warp_def $5, $6, 4, GOLDENROD_MAGNET_TRAIN_STATION warp_def $5, $b, 3, GOLDENROD_MAGNET_TRAIN_STATION -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $6, $b, Script_ArriveFromGoldenrod + coord_event 0, $6, $b, Script_ArriveFromGoldenrod -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_OFFICER, 9, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1 - person_event SPRITE_GYM_GUY, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1 - person_event SPRITE_TEACHER, 11, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SaffronTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION - person_event SPRITE_LASS, 10, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SaffronTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION + object_event SPRITE_OFFICER, 9, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1 + object_event SPRITE_GYM_GUY, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1 + object_event SPRITE_TEACHER, 11, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION + object_event SPRITE_LASS, 10, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 0b162323d..fc7806a0b 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -3,14 +3,14 @@ const_value set 2 const SEAFOAMGYM_GYM_GUY SeafoamGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - maptrigger .DummyTrigger + scene_script .DummyScene .MapCallbacks: db 0 -.DummyTrigger: +.DummyScene: end BlaineScript_0x1ab4fb: @@ -165,13 +165,13 @@ SeafoamGym_MapEventHeader: db 1 warp_def $5, $5, 1, ROUTE_20 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_BLAINE, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1 - person_event SPRITE_GYM_GUY, 5, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY + object_event SPRITE_BLAINE, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1 + object_event SPRITE_GYM_GUY, 5, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index cb3b87a23..4b87d0df4 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -3,7 +3,7 @@ const_value set 2 const SILPHCO1F_OFFICER SilphCo1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -64,13 +64,13 @@ SilphCo1F_MapEventHeader: warp_def $7, $2, 7, SAFFRON_CITY warp_def $7, $3, 7, SAFFRON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_RECEPTIONIST, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SilphCoReceptionist, -1 - person_event SPRITE_OFFICER, 1, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1 + object_event SPRITE_RECEPTIONIST, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionist, -1 + object_event SPRITE_OFFICER, 1, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1 diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index 2996b9e84..b838c9349 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -3,7 +3,7 @@ const_value set 2 const SILVERCAVEITEMROOMS_POKE_BALL2 SilverCaveItemRooms_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -24,13 +24,13 @@ SilverCaveItemRooms_MapEventHeader: warp_def $3, $d, 3, SILVER_CAVE_ROOM_2 warp_def $f, $7, 4, SILVER_CAVE_ROOM_2 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE - person_event SPRITE_POKE_BALL, 11, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE + object_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE + object_event SPRITE_POKE_BALL, 11, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 86354d742..798363c52 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -1,5 +1,5 @@ SilverCaveOutside_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -32,14 +32,14 @@ SilverCaveOutside_MapEventHeader: warp_def $13, $17, 1, SILVER_CAVE_POKECENTER_1F warp_def $b, $12, 1, SILVER_CAVE_ROOM_1 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 19, 24, SIGNPOST_READ, MtSilverPokecenterSign - signpost 13, 17, SIGNPOST_READ, MtSilverSign - signpost 25, 9, SIGNPOST_ITEM, SilverCaveOutsideHiddenFullRestore + bg_event 19, 24, BGEVENT_READ, MtSilverPokecenterSign + bg_event 13, 17, BGEVENT_READ, MtSilverSign + bg_event 25, 9, BGEVENT_ITEM, SilverCaveOutsideHiddenFullRestore -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm index dedcf8561..a1bc54a3f 100644 --- a/maps/SilverCavePokecenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -3,7 +3,7 @@ const_value set 2 const SILVERCAVEPOKECENTER1F_GRANNY SilverCavePokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -39,13 +39,13 @@ SilverCavePokecenter1F_MapEventHeader: warp_def $7, $4, 1, SILVER_CAVE_OUTSIDE warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1 - person_event SPRITE_GRANNY, 5, 1, SPRITEMOVEDATA_STANDING_LEFT, 1, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1 + object_event SPRITE_GRANNY, 5, 1, SPRITEMOVEDATA_STANDING_LEFT, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 84e05cdf7..57212bf38 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -5,7 +5,7 @@ const_value set 2 const SILVERCAVEROOM1_POKE_BALL4 SilverCaveRoom1_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -40,17 +40,17 @@ SilverCaveRoom1_MapEventHeader: warp_def $21, $9, 2, SILVER_CAVE_OUTSIDE warp_def $1, $f, 1, SILVER_CAVE_ROOM_2 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 23, 16, SIGNPOST_ITEM, SilverCaveRoom1HiddenDireHit - signpost 12, 17, SIGNPOST_ITEM, SilverCaveRoom1HiddenUltraBall + bg_event 23, 16, BGEVENT_ITEM, SilverCaveRoom1HiddenDireHit + bg_event 12, 17, BGEVENT_ITEM, SilverCaveRoom1HiddenUltraBall -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_POKE_BALL, 9, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER - person_event SPRITE_POKE_BALL, 29, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN - person_event SPRITE_POKE_BALL, 30, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE - person_event SPRITE_POKE_BALL, 18, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom1UltraBall, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL + object_event SPRITE_POKE_BALL, 9, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER + object_event SPRITE_POKE_BALL, 29, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN + object_event SPRITE_POKE_BALL, 30, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE + object_event SPRITE_POKE_BALL, 18, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1UltraBall, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 8fe28cd86..5ee1d4bf6 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -4,7 +4,7 @@ const_value set 2 const SILVERCAVEROOM2_POKE_BALL3 SilverCaveRoom2_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -34,15 +34,15 @@ SilverCaveRoom2_MapEventHeader: warp_def $15, $d, 1, SILVER_CAVE_ITEM_ROOMS warp_def $3, $17, 2, SILVER_CAVE_ITEM_ROOMS -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 31, 14, SIGNPOST_ITEM, SilverCaveRoom2HiddenMaxPotion + bg_event 31, 14, BGEVENT_ITEM, SilverCaveRoom2HiddenMaxPotion -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_POKE_BALL, 10, 24, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM - person_event SPRITE_POKE_BALL, 24, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL - person_event SPRITE_POKE_BALL, 20, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP + object_event SPRITE_POKE_BALL, 10, 24, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM + object_event SPRITE_POKE_BALL, 24, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL + object_event SPRITE_POKE_BALL, 20, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index dde8def54..717f0532b 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -2,7 +2,7 @@ const_value set 2 const SILVERCAVEROOM3_RED SilverCaveRoom3_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -58,12 +58,12 @@ SilverCaveRoom3_MapEventHeader: db 1 warp_def $21, $9, 2, SILVER_CAVE_ROOM_2 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_RED, 10, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER + object_event SPRITE_RED, 10, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index e716d3574..bd77efe09 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -10,7 +10,7 @@ const_value set 2 const SLOWPOKEWELLB1F_POKE_BALL SlowpokeWellB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -47,7 +47,7 @@ TrainerGruntM1: pause 15 special Special_FadeInQuickly disappear SLOWPOKEWELLB1F_KURT - moveperson SLOWPOKEWELLB1F_KURT, $b, $6 + moveobject SLOWPOKEWELLB1F_KURT, $b, $6 appear SLOWPOKEWELLB1F_KURT applymovement SLOWPOKEWELLB1F_KURT, KurtSlowpokeWellVictoryMovementData spriteface PLAYER, RIGHT @@ -57,7 +57,7 @@ TrainerGruntM1: closetext setevent EVENT_CLEARED_SLOWPOKE_WELL variablesprite SPRITE_AZALEA_ROCKET, SPRITE_SILVER - domaptrigger AZALEA_TOWN, $1 + setmapscene AZALEA_TOWN, $1 clearevent EVENT_ILEX_FOREST_APPRENTICE clearevent EVENT_ILEX_FOREST_FARFETCHD setevent EVENT_CHARCOAL_KILN_FARFETCH_D @@ -329,20 +329,20 @@ SlowpokeWellB1F_MapEventHeader: warp_def $f, $11, 6, AZALEA_TOWN warp_def $b, $7, 1, SLOWPOKE_WELL_B2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_ROCKET, 7, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS - person_event SPRITE_ROCKET, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS - person_event SPRITE_ROCKET, 6, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS - person_event SPRITE_ROCKET_GIRL, 4, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS - person_event SPRITE_SLOWPOKE, 4, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SlowpokeScript_0x5a681, EVENT_SLOWPOKE_WELL_SLOWPOKES - person_event SPRITE_SLOWPOKE, 2, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SlowpokeScript_0x5a695, EVENT_SLOWPOKE_WELL_SLOWPOKES - person_event SPRITE_KURT, 14, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeWellB1FKurtScript, EVENT_SLOWPOKE_WELL_KURT - person_event SPRITE_BOULDER, 2, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1 - person_event SPRITE_POKE_BALL, 3, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION + object_event SPRITE_ROCKET, 7, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS + object_event SPRITE_ROCKET, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS + object_event SPRITE_ROCKET, 6, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS + object_event SPRITE_ROCKET_GIRL, 4, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS + object_event SPRITE_SLOWPOKE, 4, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeScript_0x5a681, EVENT_SLOWPOKE_WELL_SLOWPOKES + object_event SPRITE_SLOWPOKE, 2, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeScript_0x5a695, EVENT_SLOWPOKE_WELL_SLOWPOKES + object_event SPRITE_KURT, 14, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FKurtScript, EVENT_SLOWPOKE_WELL_KURT + object_event SPRITE_BOULDER, 2, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1 + object_event SPRITE_POKE_BALL, 3, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 397203b94..21910a5fe 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -3,7 +3,7 @@ const_value set 2 const SLOWPOKEWELLB2F_POKE_BALL SlowpokeWellB2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -69,13 +69,13 @@ SlowpokeWellB2F_MapEventHeader: db 1 warp_def $b, $9, 2, SLOWPOKE_WELL_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_GYM_GUY, 4, 5, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1 - person_event SPRITE_POKE_BALL, 5, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE + object_event SPRITE_GYM_GUY, 4, 5, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1 + object_event SPRITE_POKE_BALL, 5, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index ba46065a3..4a2ddc61a 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -5,7 +5,7 @@ const_value set 2 const SOULHOUSE_GRANNY SoulHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -81,15 +81,15 @@ SoulHouse_MapEventHeader: warp_def $7, $4, 6, LAVENDER_TOWN warp_def $7, $5, 6, LAVENDER_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_GRAMPS, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, MrFuji, -1 - person_event SPRITE_TEACHER, 3, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1 - person_event SPRITE_LASS, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SoulHouseLassScript, -1 - person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SoulHouseGrannyScript, -1 + object_event SPRITE_GRAMPS, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFuji, -1 + object_event SPRITE_TEACHER, 3, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1 + object_event SPRITE_LASS, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseLassScript, -1 + object_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseGrannyScript, -1 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 782031e97..a0345f72a 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -7,7 +7,7 @@ const_value set 2 const SPROUTTOWER1F_POKE_BALL SproutTower1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -114,19 +114,19 @@ SproutTower1F_MapEventHeader: warp_def $6, $2, 2, SPROUT_TOWER_2F warp_def $3, $11, 3, SPROUT_TOWER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 15, 7, SIGNPOST_READ, MapSproutTower1FSignpost1Script - signpost 15, 12, SIGNPOST_READ, MapSproutTower1FSignpost1Script + bg_event 15, 7, BGEVENT_READ, MapSproutTower1FSignpost1Script + bg_event 15, 12, BGEVENT_READ, MapSproutTower1FSignpost1Script -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_SAGE, 4, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1 - person_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1 - person_event SPRITE_GRANNY, 12, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SproutTower1FGrannyScript, -1 - person_event SPRITE_TEACHER, 9, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SproutTower1FTeacherScript, -1 - person_event SPRITE_SAGE, 5, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerSageChow, -1 - person_event SPRITE_POKE_BALL, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL + object_event SPRITE_SAGE, 4, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1 + object_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1 + object_event SPRITE_GRANNY, 12, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FGrannyScript, -1 + object_event SPRITE_TEACHER, 9, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FTeacherScript, -1 + object_event SPRITE_SAGE, 5, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageChow, -1 + object_event SPRITE_POKE_BALL, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index acd62a2cb..4c202eb80 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -4,7 +4,7 @@ const_value set 2 const SPROUTTOWER2F_POKE_BALL SproutTower2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -95,15 +95,15 @@ SproutTower2F_MapEventHeader: warp_def $3, $11, 5, SPROUT_TOWER_1F warp_def $e, $a, 1, SPROUT_TOWER_3F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 15, 12, SIGNPOST_READ, MapSproutTower2FSignpost0Script + bg_event 15, 12, BGEVENT_READ, MapSproutTower2FSignpost0Script -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_SAGE, 3, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerSageNico, -1 - person_event SPRITE_SAGE, 14, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 5, TrainerSageEdmond, -1 - person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY + object_event SPRITE_SAGE, 3, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1 + object_event SPRITE_SAGE, 14, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1 + object_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index c882ac18e..c92926585 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -8,18 +8,18 @@ const_value set 2 const SPROUTTOWER3F_SILVER SproutTower3F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end UnknownScript_0x184947: @@ -59,7 +59,7 @@ UnknownScript_0x184947: disappear SPROUTTOWER3F_SILVER waitsfx special Special_FadeInQuickly - dotrigger $1 + setscene $1 special RestartMapMusic end @@ -337,25 +337,25 @@ SproutTower3F_MapEventHeader: db 1 warp_def $e, $a, 4, SPROUT_TOWER_2F -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $9, $b, UnknownScript_0x184947 + coord_event 0, $9, $b, UnknownScript_0x184947 -.Signposts: +.BGEvents: db 6 - signpost 1, 8, SIGNPOST_READ, MapSproutTower3FSignpost5Script - signpost 1, 11, SIGNPOST_READ, MapSproutTower3FSignpost5Script - signpost 0, 9, SIGNPOST_READ, MapSproutTower3FSignpost3Script - signpost 0, 10, SIGNPOST_READ, MapSproutTower3FSignpost3Script - signpost 15, 5, SIGNPOST_READ, MapSproutTower3FSignpost5Script - signpost 15, 14, SIGNPOST_READ, MapSproutTower3FSignpost5Script + bg_event 1, 8, BGEVENT_READ, MapSproutTower3FSignpost5Script + bg_event 1, 11, BGEVENT_READ, MapSproutTower3FSignpost5Script + bg_event 0, 9, BGEVENT_READ, MapSproutTower3FSignpost3Script + bg_event 0, 10, BGEVENT_READ, MapSproutTower3FSignpost3Script + bg_event 15, 5, BGEVENT_READ, MapSproutTower3FSignpost5Script + bg_event 15, 14, BGEVENT_READ, MapSproutTower3FSignpost5Script -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_SAGE, 13, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSageJin, -1 - person_event SPRITE_SAGE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerSageTroy, -1 - person_event SPRITE_SAGE, 2, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SageLiScript, -1 - person_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSageNeal, -1 - person_event SPRITE_POKE_BALL, 14, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION - person_event SPRITE_POKE_BALL, 1, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE - person_event SPRITE_SILVER, 4, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER + object_event SPRITE_SAGE, 13, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1 + object_event SPRITE_SAGE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1 + object_event SPRITE_SAGE, 2, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1 + object_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageNeal, -1 + object_event SPRITE_POKE_BALL, 14, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION + object_event SPRITE_POKE_BALL, 1, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE + object_event SPRITE_SILVER, 4, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 34781a23c..c96d26104 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -7,15 +7,15 @@ const_value set 2 const TEAMROCKETBASEB1F_POKE_BALL3 TeamRocketBaseB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - maptrigger .DummyTrigger + scene_script .DummyScene .MapCallbacks: db 1 dbw MAPCALLBACK_OBJECTS, .HideSecurityGrunt -.DummyTrigger: +.DummyScene: end .HideSecurityGrunt: @@ -30,7 +30,7 @@ SecurityCamera1a: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $2 + moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $2 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -39,7 +39,7 @@ SecurityCamera1a: scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $2 + moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $2 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt2 @@ -55,7 +55,7 @@ SecurityCamera1b: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $3 + moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $3 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -64,7 +64,7 @@ SecurityCamera1b: scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $3 + moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $3 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt2 @@ -80,7 +80,7 @@ SecurityCamera2a: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $4, $7 + moveobject TEAMROCKETBASEB1F_ROCKET1, $4, $7 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement2 @@ -90,7 +90,7 @@ SecurityCamera2a: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson TEAMROCKETBASEB1F_ROCKET1, $c, $5 + moveobject TEAMROCKETBASEB1F_ROCKET1, $c, $5 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement3 scall TrainerCameraGrunt2 @@ -106,7 +106,7 @@ SecurityCamera2b: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $4, $8 + moveobject TEAMROCKETBASEB1F_ROCKET1, $4, $8 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement4 @@ -116,7 +116,7 @@ SecurityCamera2b: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson TEAMROCKETBASEB1F_ROCKET1, $c, $5 + moveobject TEAMROCKETBASEB1F_ROCKET1, $c, $5 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement5 scall TrainerCameraGrunt2 @@ -132,7 +132,7 @@ SecurityCamera3a: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $6 + moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $6 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -142,7 +142,7 @@ SecurityCamera3a: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson TEAMROCKETBASEB1F_ROCKET1, $19, $b + moveobject TEAMROCKETBASEB1F_ROCKET1, $19, $b appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement6 scall TrainerCameraGrunt2 @@ -158,7 +158,7 @@ SecurityCamera3b: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $7 + moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $7 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -168,7 +168,7 @@ SecurityCamera3b: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson TEAMROCKETBASEB1F_ROCKET1, $19, $c + moveobject TEAMROCKETBASEB1F_ROCKET1, $19, $c appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement7 scall TrainerCameraGrunt2 @@ -184,7 +184,7 @@ SecurityCamera4: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $11, $10 + moveobject TEAMROCKETBASEB1F_ROCKET1, $11, $10 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -194,7 +194,7 @@ SecurityCamera4: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson TEAMROCKETBASEB1F_ROCKET1, $19, $b + moveobject TEAMROCKETBASEB1F_ROCKET1, $19, $b appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement8 scall TrainerCameraGrunt2 @@ -210,7 +210,7 @@ SecurityCamera5: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $3, $10 + moveobject TEAMROCKETBASEB1F_ROCKET1, $3, $10 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -220,7 +220,7 @@ SecurityCamera5: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson TEAMROCKETBASEB1F_ROCKET1, $e, $10 + moveobject TEAMROCKETBASEB1F_ROCKET1, $e, $10 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement9 scall TrainerCameraGrunt2 @@ -738,60 +738,60 @@ TeamRocketBaseB1F_MapEventHeader: warp_def $f, $5, 4, TEAM_ROCKET_BASE_B1F warp_def $2, $19, 3, TEAM_ROCKET_BASE_B1F -.XYTriggers: +.CoordEvents: db 30 ; There are five security cameras in the base. ; Walking in front of one triggers two Rocket Grunts. - xy_trigger 0, $2, $18, SecurityCamera1a - xy_trigger 0, $3, $18, SecurityCamera1b - xy_trigger 0, $2, $6, SecurityCamera2a - xy_trigger 0, $3, $6, SecurityCamera2b - xy_trigger 0, $6, $18, SecurityCamera3a - xy_trigger 0, $7, $18, SecurityCamera3b - xy_trigger 0, $10, $16, SecurityCamera4 - xy_trigger 0, $10, $8, SecurityCamera5 + coord_event 0, $2, $18, SecurityCamera1a + coord_event 0, $3, $18, SecurityCamera1b + coord_event 0, $2, $6, SecurityCamera2a + coord_event 0, $3, $6, SecurityCamera2b + coord_event 0, $6, $18, SecurityCamera3a + coord_event 0, $7, $18, SecurityCamera3b + coord_event 0, $10, $16, SecurityCamera4 + coord_event 0, $10, $8, SecurityCamera5 ; There are spots on the floor that trigger a Pokémon battle. ; Each Pokémon (Voltorb, Koffing, Geodude) knows Selfdestruct. - xy_trigger 0, $7, $2, ExplodingTrap1 - xy_trigger 0, $7, $3, ExplodingTrap2 - xy_trigger 0, $7, $4, ExplodingTrap3 - xy_trigger 0, $8, $1, ExplodingTrap4 - xy_trigger 0, $8, $3, ExplodingTrap5 - xy_trigger 0, $8, $5, ExplodingTrap6 - xy_trigger 0, $9, $3, ExplodingTrap7 - xy_trigger 0, $9, $4, ExplodingTrap8 - xy_trigger 0, $a, $1, ExplodingTrap9 - xy_trigger 0, $a, $2, ExplodingTrap10 - xy_trigger 0, $a, $3, ExplodingTrap11 - xy_trigger 0, $a, $5, ExplodingTrap12 - xy_trigger 0, $b, $2, ExplodingTrap13 - xy_trigger 0, $b, $4, ExplodingTrap14 - xy_trigger 0, $c, $1, ExplodingTrap15 - xy_trigger 0, $c, $2, ExplodingTrap16 - xy_trigger 0, $c, $4, ExplodingTrap17 - xy_trigger 0, $c, $5, ExplodingTrap18 - xy_trigger 0, $d, $1, ExplodingTrap19 - xy_trigger 0, $d, $3, ExplodingTrap20 - xy_trigger 0, $d, $4, ExplodingTrap21 - xy_trigger 0, $d, $5, ExplodingTrap22 + coord_event 0, $7, $2, ExplodingTrap1 + coord_event 0, $7, $3, ExplodingTrap2 + coord_event 0, $7, $4, ExplodingTrap3 + coord_event 0, $8, $1, ExplodingTrap4 + coord_event 0, $8, $3, ExplodingTrap5 + coord_event 0, $8, $5, ExplodingTrap6 + coord_event 0, $9, $3, ExplodingTrap7 + coord_event 0, $9, $4, ExplodingTrap8 + coord_event 0, $a, $1, ExplodingTrap9 + coord_event 0, $a, $2, ExplodingTrap10 + coord_event 0, $a, $3, ExplodingTrap11 + coord_event 0, $a, $5, ExplodingTrap12 + coord_event 0, $b, $2, ExplodingTrap13 + coord_event 0, $b, $4, ExplodingTrap14 + coord_event 0, $c, $1, ExplodingTrap15 + coord_event 0, $c, $2, ExplodingTrap16 + coord_event 0, $c, $4, ExplodingTrap17 + coord_event 0, $c, $5, ExplodingTrap18 + coord_event 0, $d, $1, ExplodingTrap19 + coord_event 0, $d, $3, ExplodingTrap20 + coord_event 0, $d, $4, ExplodingTrap21 + coord_event 0, $d, $5, ExplodingTrap22 -.Signposts: +.BGEvents: db 9 - signpost 11, 19, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost0Script - signpost 1, 24, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script - signpost 1, 6, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script - signpost 15, 8, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script - signpost 15, 22, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script - signpost 5, 24, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script - signpost 11, 20, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost7Script - signpost 11, 21, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost7Script - signpost 11, 3, SIGNPOST_ITEM, TeamRocketBaseB1FHiddenRevive + bg_event 11, 19, BGEVENT_READ, MapTeamRocketBaseB1FSignpost0Script + bg_event 1, 24, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script + bg_event 1, 6, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script + bg_event 15, 8, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script + bg_event 15, 22, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script + bg_event 5, 24, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script + bg_event 11, 20, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script + bg_event 11, 21, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script + bg_event 11, 3, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_ROCKET, 0, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS - person_event SPRITE_ROCKET, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_SCIENTIST, 12, 18, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_POKE_BALL, 6, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB1FHyperPotion, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION - person_event SPRITE_POKE_BALL, 15, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB1FNugget, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET - person_event SPRITE_POKE_BALL, 12, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB1FGuardSpec, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC + object_event SPRITE_ROCKET, 0, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS + object_event SPRITE_ROCKET, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_SCIENTIST, 12, 18, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_POKE_BALL, 6, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FHyperPotion, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION + object_event SPRITE_POKE_BALL, 15, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FNugget, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET + object_event SPRITE_POKE_BALL, 12, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FGuardSpec, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 84f1a3148..12930b544 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -15,27 +15,27 @@ const_value set 2 const TEAMROCKETBASEB2F_POKE_BALL TeamRocketBaseB2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 4 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 - maptrigger .DummyTrigger2 - maptrigger .DummyTrigger3 + scene_script .DummyScene0 + scene_script .DummyScene1 + scene_script .DummyScene2 + scene_script .DummyScene3 .MapCallbacks: db 1 dbw MAPCALLBACK_TILES, .TransmitterDoorCallback -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end -.DummyTrigger2: +.DummyScene2: end -.DummyTrigger3: +.DummyScene3: end .TransmitterDoorCallback: @@ -48,14 +48,14 @@ TeamRocketBaseB2F_MapScriptHeader: return UnknownScript_0x6cf95: - moveperson TEAMROCKETBASEB2F_LANCE, $9, $d + moveobject TEAMROCKETBASEB2F_LANCE, $9, $d jump UnknownScript_0x6cfac UnknownScript_0x6cf9c: - moveperson TEAMROCKETBASEB2F_ROCKET_GIRL, $15, $10 - moveperson TEAMROCKETBASEB2F_ROCKET1, $15, $10 - moveperson TEAMROCKETBASEB2F_DRAGON, $a, $d - moveperson TEAMROCKETBASEB2F_LANCE, $a, $d + moveobject TEAMROCKETBASEB2F_ROCKET_GIRL, $15, $10 + moveobject TEAMROCKETBASEB2F_ROCKET1, $15, $10 + moveobject TEAMROCKETBASEB2F_DRAGON, $a, $d + moveobject TEAMROCKETBASEB2F_LANCE, $a, $d UnknownScript_0x6cfac: appear TEAMROCKETBASEB2F_ROCKET_GIRL appear TEAMROCKETBASEB2F_ROCKET1 @@ -118,7 +118,7 @@ UnknownScript_0x6cfac: disappear TEAMROCKETBASEB2F_ROCKET4 pause 15 special Special_FadeInQuickly - dotrigger $2 + setscene $2 clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE spriteface TEAMROCKETBASEB2F_LANCE, DOWN opentext @@ -175,7 +175,7 @@ LanceHealsCommon: writetext LanceHealsText2 waitbutton closetext - dotrigger $1 + setscene $1 setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE checkcode VAR_FACING if_equal RIGHT, UnknownScript_0x6d0be @@ -280,7 +280,7 @@ UnknownScript_0x6d182: end UnknownScript_0x6d184: - moveperson TEAMROCKETBASEB2F_LANCE, $12, $6 + moveobject TEAMROCKETBASEB2F_LANCE, $12, $6 appear TEAMROCKETBASEB2F_LANCE applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a spriteface PLAYER, RIGHT @@ -304,7 +304,7 @@ UnknownScript_0x6d184: clearflag ENGINE_ROCKET_SIGNAL_ON_CH20 setevent EVENT_ROUTE_43_GATE_ROCKETS setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM - dotrigger $3 + setscene $3 clearevent EVENT_LAKE_OF_RAGE_CIVILIANS setevent EVENT_TURNED_OFF_SECURITY_CAMERAS setevent EVENT_SECURITY_CAMERA_1 @@ -921,57 +921,57 @@ TeamRocketBaseB2F_MapEventHeader: warp_def $6, $3, 3, TEAM_ROCKET_BASE_B3F warp_def $e, $1b, 4, TEAM_ROCKET_BASE_B3F -.XYTriggers: +.CoordEvents: db 9 - xy_trigger 0, $e, $5, LanceHealsScript1 - xy_trigger 0, $d, $4, LanceHealsScript2 - xy_trigger 1, $b, $e, UnknownScript_0x6cf95 - xy_trigger 1, $b, $f, UnknownScript_0x6cf9c - xy_trigger 2, $c, $e, UnknownScript_0x6d075 - xy_trigger 2, $c, $f, UnknownScript_0x6d075 - xy_trigger 2, $3, $c, UnknownScript_0x6d07a - xy_trigger 2, $a, $c, UnknownScript_0x6d07a - xy_trigger 2, $b, $c, UnknownScript_0x6d07a + coord_event 0, $e, $5, LanceHealsScript1 + coord_event 0, $d, $4, LanceHealsScript2 + coord_event 1, $b, $e, UnknownScript_0x6cf95 + coord_event 1, $b, $f, UnknownScript_0x6cf9c + coord_event 2, $c, $e, UnknownScript_0x6d075 + coord_event 2, $c, $f, UnknownScript_0x6d075 + coord_event 2, $3, $c, UnknownScript_0x6d07a + coord_event 2, $a, $c, UnknownScript_0x6d07a + coord_event 2, $b, $c, UnknownScript_0x6d07a -.Signposts: +.BGEvents: db 23 - signpost 12, 14, SIGNPOST_IFNOTSET, TeamRocketBaseB2FLockedDoor - signpost 12, 15, SIGNPOST_IFNOTSET, TeamRocketBaseB2FLockedDoor - signpost 9, 17, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 9, 16, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 9, 15, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 9, 14, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 9, 13, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 9, 12, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 8, 12, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 7, 12, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 6, 12, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 5, 12, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 4, 12, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 4, 13, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 4, 14, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 4, 15, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 4, 16, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 4, 17, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 5, 17, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 6, 17, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 7, 17, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 8, 17, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript - signpost 7, 26, SIGNPOST_ITEM, TeamRocketBaseB2FHiddenFullHeal + bg_event 12, 14, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor + bg_event 12, 15, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor + bg_event 9, 17, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 9, 16, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 9, 15, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 9, 14, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 9, 13, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 9, 12, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 8, 12, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 7, 12, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 6, 12, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 5, 12, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 4, 12, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 4, 13, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 4, 14, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 4, 15, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 4, 16, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 4, 17, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 5, 17, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 6, 17, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 7, 17, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 8, 17, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 7, 26, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal -.PersonEvents: +.ObjectEvents: db 14 - person_event SPRITE_ROCKET, 16, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE - person_event SPRITE_ROCKET_GIRL, 16, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE - person_event SPRITE_LANCE, 13, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE - person_event SPRITE_DRAGON, 13, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE - person_event SPRITE_VOLTORB, 5, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketElectrode1, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 - person_event SPRITE_VOLTORB, 7, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketElectrode2, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 - person_event SPRITE_VOLTORB, 9, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketElectrode3, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 - person_event SPRITE_VOLTORB, 5, 22, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 - person_event SPRITE_VOLTORB, 7, 22, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 - person_event SPRITE_VOLTORB, 9, 22, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 - person_event SPRITE_ROCKET, 13, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_ROCKET, 1, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_ROCKET, 14, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_POKE_BALL, 10, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF + object_event SPRITE_ROCKET, 16, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE + object_event SPRITE_ROCKET_GIRL, 16, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE + object_event SPRITE_LANCE, 13, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE + object_event SPRITE_DRAGON, 13, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE + object_event SPRITE_VOLTORB, 5, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode1, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 + object_event SPRITE_VOLTORB, 7, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode2, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 + object_event SPRITE_VOLTORB, 9, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode3, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 + object_event SPRITE_VOLTORB, 5, 22, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 + object_event SPRITE_VOLTORB, 7, 22, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 + object_event SPRITE_VOLTORB, 9, 22, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 + object_event SPRITE_ROCKET, 13, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_ROCKET, 1, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_ROCKET, 14, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_POKE_BALL, 10, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 905cdad4d..f366f35aa 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -15,12 +15,12 @@ const_value set 2 const TEAMROCKETBASEB3F_POKE_BALL5 TeamRocketBaseB3F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 4 - maptrigger .LanceGetsPassword - maptrigger .DummyTrigger1 - maptrigger .DummyTrigger2 - maptrigger .DummyTrigger3 + scene_script .LanceGetsPassword + scene_script .DummyScene1 + scene_script .DummyScene2 + scene_script .DummyScene3 .MapCallbacks: db 1 @@ -30,13 +30,13 @@ TeamRocketBaseB3F_MapScriptHeader: priorityjump LanceGetPasswordScript end -.DummyTrigger1: +.DummyScene1: end -.DummyTrigger2: +.DummyScene2: end -.DummyTrigger3: +.DummyScene3: end .CheckGiovanniDoor: @@ -60,7 +60,7 @@ LanceGetPasswordScript: closetext applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12c disappear TEAMROCKETBASEB3F_LANCE - dotrigger $1 + setscene $1 end RocketBaseRival: @@ -79,7 +79,7 @@ RocketBaseRival: applymovement PLAYER, RocketBaseRivalShovesPlayerMovement applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalLeaveMovement disappear TEAMROCKETBASEB3F_SILVER - dotrigger $2 + setscene $2 special RestartMapMusic end @@ -116,7 +116,7 @@ UnknownScript_0x6e056: playsound SFX_TACKLE applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e147 disappear TEAMROCKETBASEB3F_ROCKET1 - dotrigger $3 + setscene $3 end RocketBaseMurkrow: @@ -576,38 +576,38 @@ TeamRocketBaseB3F_MapEventHeader: warp_def $6, $3, 4, TEAM_ROCKET_BASE_B2F warp_def $e, $1b, 5, TEAM_ROCKET_BASE_B2F -.XYTriggers: +.CoordEvents: db 3 - xy_trigger 2, $8, $a, UnknownScript_0x6e04b - xy_trigger 2, $8, $b, UnknownScript_0x6e052 - xy_trigger 1, $a, $8, RocketBaseRival + coord_event 2, $8, $a, UnknownScript_0x6e04b + coord_event 2, $8, $b, UnknownScript_0x6e052 + coord_event 1, $a, $8, RocketBaseRival -.Signposts: +.BGEvents: db 10 - signpost 9, 10, SIGNPOST_IFNOTSET, TeamRocketBaseB3FLockedDoor - signpost 9, 11, SIGNPOST_IFNOTSET, TeamRocketBaseB3FLockedDoor - signpost 1, 10, SIGNPOST_READ, TeamRocketBaseB3FOathScript - signpost 1, 11, SIGNPOST_READ, TeamRocketBaseB3FOathScript - signpost 1, 12, SIGNPOST_READ, TeamRocketBaseB3FOathScript - signpost 1, 13, SIGNPOST_READ, TeamRocketBaseB3FOathScript - signpost 13, 4, SIGNPOST_READ, TeamRocketBaseB3FOathScript - signpost 13, 5, SIGNPOST_READ, TeamRocketBaseB3FOathScript - signpost 13, 6, SIGNPOST_READ, TeamRocketBaseB3FOathScript - signpost 13, 7, SIGNPOST_READ, TeamRocketBaseB3FOathScript + bg_event 9, 10, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor + bg_event 9, 11, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor + bg_event 1, 10, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 1, 11, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 1, 12, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 1, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 13, 4, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 13, 5, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 13, 6, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 13, 7, BGEVENT_READ, TeamRocketBaseB3FOathScript -.PersonEvents: +.ObjectEvents: db 14 - person_event SPRITE_LANCE, 14, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LanceGetPasswordScript, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS - person_event SPRITE_ROCKET, 3, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE - person_event SPRITE_MOLTRES, 2, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_ROCKET_GIRL, 7, 21, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 0, SlowpokeTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_ROCKET, 14, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, RaticateTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_SCIENTIST, 11, 23, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_ROCKET, 14, 24, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeamRocketBaseB3FRocketScript, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_SILVER, 5, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE - person_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN - person_event SPRITE_POKE_BALL, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL - person_event SPRITE_POKE_BALL, 9, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FFullHeal, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL - person_event SPRITE_POKE_BALL, 2, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FIceHeal, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL - person_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FUltraBall, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL + object_event SPRITE_LANCE, 14, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceGetPasswordScript, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS + object_event SPRITE_ROCKET, 3, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE + object_event SPRITE_MOLTRES, 2, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_ROCKET_GIRL, 7, 21, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, SlowpokeTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_ROCKET, 14, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, RaticateTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_SCIENTIST, 11, 23, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_ROCKET, 14, 24, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeamRocketBaseB3FRocketScript, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_SILVER, 5, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE + object_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN + object_event SPRITE_POKE_BALL, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL + object_event SPRITE_POKE_BALL, 9, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FFullHeal, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL + object_event SPRITE_POKE_BALL, 2, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FIceHeal, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL + object_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FUltraBall, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index e9f10d578..03c22bad3 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -3,10 +3,10 @@ const_value set 2 const TIMECAPSULE_CHRIS2 TimeCapsule_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .InitializeTimeCapsule - maptrigger .DummyTrigger + scene_script .InitializeTimeCapsule + scene_script .DummyScene .MapCallbacks: db 1 @@ -16,7 +16,7 @@ TimeCapsule_MapScriptHeader: priorityjump .InitializeAndPreparePokecenter2F end -.DummyTrigger: +.DummyScene: end .SetWhichChris: @@ -32,8 +32,8 @@ TimeCapsule_MapScriptHeader: return .InitializeAndPreparePokecenter2F: - dotrigger $1 - domaptrigger POKECENTER_2F, $3 + setscene $1 + setmapscene POKECENTER_2F, $3 end MapTimeCapsuleSignpost1Script: @@ -62,15 +62,15 @@ TimeCapsule_MapEventHeader: warp_def $7, $4, 4, POKECENTER_2F warp_def $7, $5, 4, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 4, 4, SIGNPOST_RIGHT, MapTimeCapsuleSignpost1Script - signpost 4, 5, SIGNPOST_LEFT, MapTimeCapsuleSignpost1Script + bg_event 4, 4, BGEVENT_RIGHT, MapTimeCapsuleSignpost1Script + bg_event 4, 5, BGEVENT_LEFT, MapTimeCapsuleSignpost1Script -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT + object_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS + object_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 87fbfe13e..1d0340a0b 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -11,10 +11,10 @@ const_value set 2 const TINTOWER1F_SAGE6 TinTower1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .FaceSuicune - maptrigger .DummyTrigger + scene_script .FaceSuicune + scene_script .DummyScene .MapCallbacks: db 2 @@ -25,7 +25,7 @@ TinTower1F_MapScriptHeader: priorityjump .SuicuneBattle end -.DummyTrigger: +.DummyScene: end .NPCsCallback: @@ -125,36 +125,36 @@ TinTower1F_MapScriptHeader: disappear TINTOWER1F_SUICUNE setevent EVENT_FOUGHT_SUICUNE setevent EVENT_SAW_SUICUNE_ON_ROUTE_42 - domaptrigger ROUTE_42, $0 + setmapscene ROUTE_42, $0 setevent EVENT_SAW_SUICUNE_ON_ROUTE_36 - domaptrigger ROUTE_36, $0 + setmapscene ROUTE_36, $0 setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY - domaptrigger CIANWOOD_CITY, $0 - dotrigger $1 + setmapscene CIANWOOD_CITY, $0 + setscene $1 clearevent EVENT_SET_WHEN_FOUGHT_HO_OH reloadmapafterbattle pause 20 spriteface PLAYER, DOWN playmusic MUSIC_MYSTICALMAN_ENCOUNTER playsound SFX_ENTER_DOOR - moveperson TINTOWER1F_EUSINE, $a, $f + moveobject TINTOWER1F_EUSINE, $a, $f appear TINTOWER1F_EUSINE applymovement TINTOWER1F_EUSINE, MovementData_0x1851ec playsound SFX_ENTER_DOOR - moveperson TINTOWER1F_SAGE1, $9, $f + moveobject TINTOWER1F_SAGE1, $9, $f appear TINTOWER1F_SAGE1 applymovement TINTOWER1F_SAGE1, MovementData_0x1851f5 playsound SFX_ENTER_DOOR - moveperson TINTOWER1F_SAGE2, $9, $f + moveobject TINTOWER1F_SAGE2, $9, $f appear TINTOWER1F_SAGE2 applymovement TINTOWER1F_SAGE2, MovementData_0x1851fb playsound SFX_ENTER_DOOR - moveperson TINTOWER1F_SAGE3, $9, $f + moveobject 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 + moveobject TINTOWER1F_SAGE1, $7, $d + moveobject TINTOWER1F_SAGE2, $9, $d + moveobject TINTOWER1F_SAGE3, $b, $d spriteface PLAYER, RIGHT opentext writetext TinTowerEusineSuicuneText @@ -532,21 +532,21 @@ TinTower1F_MapEventHeader: warp_def $f, $a, 12, ECRUTEAK_CITY warp_def $2, $a, 2, TIN_TOWER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 10 - person_event SPRITE_SUICUNE, 9, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE - person_event SPRITE_RAIKOU, 9, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU - person_event SPRITE_ENTEI, 9, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI - person_event SPRITE_SUPER_NERD, 3, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE - person_event SPRITE_SAGE, 9, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 - person_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TinTower1FSage2Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 - person_event SPRITE_SAGE, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TinTower1FSage3Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 - person_event SPRITE_SAGE, 2, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TinTower1FSage4Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 - person_event SPRITE_SAGE, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TinTower1FSage5Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 - person_event SPRITE_SAGE, 2, 14, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TinTower1FSage6Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + object_event SPRITE_SUICUNE, 9, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE + object_event SPRITE_RAIKOU, 9, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU + object_event SPRITE_ENTEI, 9, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI + object_event SPRITE_SUPER_NERD, 3, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE + object_event SPRITE_SAGE, 9, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + object_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage2Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + object_event SPRITE_SAGE, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage3Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + object_event SPRITE_SAGE, 2, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage4Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + object_event SPRITE_SAGE, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage5Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + object_event SPRITE_SAGE, 2, 14, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage6Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index 95c9724ea..e572e6907 100644 --- a/maps/TinTower2F.asm +++ b/maps/TinTower2F.asm @@ -1,5 +1,5 @@ TinTower2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -14,11 +14,11 @@ TinTower2F_MapEventHeader: warp_def $e, $a, 1, TIN_TOWER_3F warp_def $2, $a, 3, TIN_TOWER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 197859e64..c3d36d9cf 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -2,7 +2,7 @@ const_value set 2 const TINTOWER3F_POKE_BALL TinTower3F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -20,12 +20,12 @@ TinTower3F_MapEventHeader: warp_def $e, $a, 1, TIN_TOWER_2F warp_def $2, $10, 2, TIN_TOWER_4F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKE_BALL, 14, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL + object_event SPRITE_POKE_BALL, 14, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 5abc17a22..e04404c5d 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -4,7 +4,7 @@ const_value set 2 const TINTOWER4F_POKE_BALL3 TinTower4F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -34,15 +34,15 @@ TinTower4F_MapEventHeader: warp_def $e, $2, 3, TIN_TOWER_5F warp_def $f, $11, 4, TIN_TOWER_5F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 6, 11, SIGNPOST_ITEM, TinTower4FHiddenMaxPotion + bg_event 6, 11, BGEVENT_ITEM, TinTower4FHiddenMaxPotion -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL - person_event SPRITE_POKE_BALL, 14, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP - person_event SPRITE_POKE_BALL, 12, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE + object_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL + object_event SPRITE_POKE_BALL, 14, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP + object_event SPRITE_POKE_BALL, 12, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 8c9c09730..b3448203f 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -2,7 +2,7 @@ const_value set 2 const TINTOWER5F_POKE_BALL TinTower5F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -30,14 +30,14 @@ TinTower5F_MapEventHeader: warp_def $e, $2, 3, TIN_TOWER_4F warp_def $f, $11, 4, TIN_TOWER_4F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 14, 16, SIGNPOST_ITEM, TinTower5FHiddenFullRestore - signpost 15, 3, SIGNPOST_ITEM, TinTower5FHiddenCarbos + bg_event 14, 16, BGEVENT_ITEM, TinTower5FHiddenFullRestore + bg_event 15, 3, BGEVENT_ITEM, TinTower5FHiddenCarbos -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKE_BALL, 9, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY + object_event SPRITE_POKE_BALL, 9, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index d95d20429..0d297498f 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -2,7 +2,7 @@ const_value set 2 const TINTOWER6F_POKE_BALL TinTower6F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -20,12 +20,12 @@ TinTower6F_MapEventHeader: warp_def $9, $3, 1, TIN_TOWER_7F warp_def $f, $b, 1, TIN_TOWER_5F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKE_BALL, 8, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION + object_event SPRITE_POKE_BALL, 8, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index 2baba56cd..f7be3a5d8 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -2,7 +2,7 @@ const_value set 2 const TINTOWER7F_POKE_BALL TinTower7F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -23,12 +23,12 @@ TinTower7F_MapEventHeader: warp_def $3, $8, 3, TIN_TOWER_7F warp_def $9, $6, 5, TIN_TOWER_9F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKE_BALL, 1, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE + object_event SPRITE_POKE_BALL, 1, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 5156e92d1..bdbdca1b7 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -4,7 +4,7 @@ const_value set 2 const TINTOWER8F_POKE_BALL3 TinTower8F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -32,14 +32,14 @@ TinTower8F_MapEventHeader: warp_def $f, $e, 6, TIN_TOWER_9F warp_def $9, $6, 7, TIN_TOWER_9F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET - person_event SPRITE_POKE_BALL, 6, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER - person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE + object_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET + object_event SPRITE_POKE_BALL, 6, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER + object_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 14a458528..83431425c 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -2,7 +2,7 @@ const_value set 2 const TINTOWER9F_POKE_BALL TinTower9F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -35,12 +35,12 @@ TinTower9F_MapEventHeader: warp_def $d, $6, 5, TIN_TOWER_8F warp_def $d, $8, 6, TIN_TOWER_8F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKE_BALL, 1, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP + object_event SPRITE_POKE_BALL, 1, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index fcf3964fa..0a70a58ee 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -2,7 +2,7 @@ const_value set 2 const TINTOWERROOF_HO_OH TinTowerRoof_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -52,12 +52,12 @@ TinTowerRoof_MapEventHeader: db 1 warp_def $d, $9, 4, TIN_TOWER_9F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_HO_OH, 5, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH + object_event SPRITE_HO_OH, 5, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index 0360c8d08..2f3589e16 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -2,7 +2,7 @@ const_value set 2 const TOHJOFALLS_POKE_BALL TohjoFalls_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -20,12 +20,12 @@ TohjoFalls_MapEventHeader: warp_def $f, $d, 2, ROUTE_27 warp_def $f, $19, 3, ROUTE_27 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE + object_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index e0c984b36..ebd3d8a3a 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -3,10 +3,10 @@ const_value set 2 const TRADECENTER_CHRIS2 TradeCenter_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .InitializeTradeCenter - maptrigger .DummyTrigger + scene_script .InitializeTradeCenter + scene_script .DummyScene .MapCallbacks: db 1 @@ -16,7 +16,7 @@ TradeCenter_MapScriptHeader: priorityjump .InitializeAndPreparePokecenter2F end -.DummyTrigger: +.DummyScene: end .SetWhichChris: @@ -32,8 +32,8 @@ TradeCenter_MapScriptHeader: return .InitializeAndPreparePokecenter2F: - dotrigger $1 - domaptrigger POKECENTER_2F, $1 + setscene $1 + setmapscene POKECENTER_2F, $1 end MapTradeCenterSignpost1Script: @@ -62,15 +62,15 @@ TradeCenter_MapEventHeader: warp_def $7, $4, 2, POKECENTER_2F warp_def $7, $5, 2, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 4, 4, SIGNPOST_RIGHT, MapTradeCenterSignpost1Script - signpost 4, 5, SIGNPOST_LEFT, MapTradeCenterSignpost1Script + bg_event 4, 4, BGEVENT_RIGHT, MapTradeCenterSignpost1Script + bg_event 4, 5, BGEVENT_LEFT, MapTradeCenterSignpost1Script -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT + object_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS + object_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index 87fd7b592..d62a0673f 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -6,7 +6,7 @@ const_value set 2 const TRAINERHOUSE1F_GENTLEMAN TrainerHouse1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -147,19 +147,19 @@ TrainerHouse1F_MapEventHeader: warp_def $d, $3, 3, VIRIDIAN_CITY warp_def $2, $8, 1, TRAINER_HOUSE_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 0, 5, SIGNPOST_READ, MapTrainerHouse1FSignpost0Script - signpost 0, 7, SIGNPOST_READ, MapTrainerHouse1FSignpost1Script - signpost 10, 7, SIGNPOST_READ, MapTrainerHouse1FSignpost2Script + bg_event 0, 5, BGEVENT_READ, MapTrainerHouse1FSignpost0Script + bg_event 0, 7, BGEVENT_READ, MapTrainerHouse1FSignpost1Script + bg_event 10, 7, BGEVENT_READ, MapTrainerHouse1FSignpost2Script -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_RECEPTIONIST, 11, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1 - person_event SPRITE_COOLTRAINER_M, 11, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1 - person_event SPRITE_YOUNGSTER, 8, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TrainerHouse1FYoungsterScript, -1 - person_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TrainerHouse1FGentlemanScript, -1 + object_event SPRITE_RECEPTIONIST, 11, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1 + object_event SPRITE_COOLTRAINER_M, 11, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1 + object_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1 + object_event SPRITE_YOUNGSTER, 8, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FYoungsterScript, -1 + object_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FGentlemanScript, -1 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index caae8972d..43d3bcd38 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -3,14 +3,14 @@ const_value set 2 const TRAINERHOUSEB1F_CHRIS TrainerHouseB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - maptrigger .DummyTrigger + scene_script .DummyScene .MapCallbacks: db 0 -.DummyTrigger: +.DummyScene: end TrainerHouseReceptionistScript: @@ -177,14 +177,14 @@ TrainerHouseB1F_MapEventHeader: db 1 warp_def $4, $9, 3, TRAINER_HOUSE_1F -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $3, $7, TrainerHouseReceptionistScript + coord_event 0, $3, $7, TrainerHouseReceptionistScript -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_RECEPTIONIST, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 - person_event SPRITE_CHRIS, 11, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event SPRITE_RECEPTIONIST, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event SPRITE_CHRIS, 11, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/Underground.asm b/maps/Underground.asm index e3c1ec3ca..dbfecbda2 100644 --- a/maps/Underground.asm +++ b/maps/Underground.asm @@ -1,5 +1,5 @@ Underground_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -22,13 +22,13 @@ Underground_MapEventHeader: warp_def $2, $3, 3, ROUTE_5_UNDERGROUND_ENTRANCE warp_def $18, $3, 3, ROUTE_6_UNDERGROUND_ENTRANCE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 9, 3, SIGNPOST_ITEM, UndergroundHiddenFullRestore - signpost 19, 1, SIGNPOST_ITEM, UndergroundHiddenXSpecial + bg_event 9, 3, BGEVENT_ITEM, UndergroundHiddenFullRestore + bg_event 19, 1, BGEVENT_ITEM, UndergroundHiddenXSpecial -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index abfbb0f72..92c18ce86 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -44,19 +44,19 @@ const_value set 2 const UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER UndergroundPathSwitchRoomEntrances_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 dbw MAPCALLBACK_TILES, .UpdateDoorPositions -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end .UpdateDoorPositions: @@ -117,7 +117,7 @@ SuperNerdScript_0x7ca7a: TeacherScript_0x7ca7d: jumptextfaceplayer UndergroundPathSwitchRoomEntrances_TeacherText -UndergroundSilverTrigger1: +UndergroundSilverScene1: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic @@ -131,12 +131,12 @@ UndergroundSilverTrigger1: applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1 playsound SFX_EXIT_BUILDING disappear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER - dotrigger 1 + setscene 1 waitsfx playmapmusic end -UndergroundSilverTrigger2: +UndergroundSilverScene2: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic @@ -150,7 +150,7 @@ UndergroundSilverTrigger2: applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2 playsound SFX_EXIT_BUILDING disappear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER - dotrigger 1 + setscene 1 waitsfx playmapmusic end @@ -159,7 +159,7 @@ UndergroundSilverBattleScript: checkevent EVENT_RIVAL_BURNED_TOWER iftrue .Continue setevent EVENT_RIVAL_BURNED_TOWER - domaptrigger BURNED_TOWER_1F, 1 + setmapscene BURNED_TOWER_1F, 1 .Continue: playmusic MUSIC_RIVAL_ENCOUNTER opentext @@ -947,30 +947,30 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: warp_def $1d, $14, 13, GOLDENROD_CITY warp_def $1d, $15, 13, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $4, $13, UndergroundSilverTrigger1 - xy_trigger 0, $5, $13, UndergroundSilverTrigger2 + coord_event 0, $4, $13, UndergroundSilverScene1 + coord_event 0, $5, $13, UndergroundSilverScene2 -.Signposts: +.BGEvents: db 6 - signpost 1, 16, SIGNPOST_READ, Switch1Script - signpost 1, 10, SIGNPOST_READ, Switch2Script - signpost 1, 2, SIGNPOST_READ, Switch3Script - signpost 11, 20, SIGNPOST_READ, EmergencySwitchScript - signpost 9, 8, SIGNPOST_ITEM, UndergroundPathSwitchRoomEntrancesHiddenMaxPotion - signpost 8, 1, SIGNPOST_ITEM, UndergroundPathSwitchRoomEntrancesHiddenRevive + bg_event 1, 16, BGEVENT_READ, Switch1Script + bg_event 1, 10, BGEVENT_READ, Switch2Script + bg_event 1, 2, BGEVENT_READ, Switch3Script + bg_event 11, 20, BGEVENT_READ, EmergencySwitchScript + bg_event 9, 8, BGEVENT_ITEM, UndergroundPathSwitchRoomEntrancesHiddenMaxPotion + bg_event 8, 1, BGEVENT_ITEM, UndergroundPathSwitchRoomEntrancesHiddenRevive -.PersonEvents: +.ObjectEvents: db 11 - person_event SPRITE_PHARMACIST, 12, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_PHARMACIST, 8, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 2, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET_GIRL, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_TEACHER, 27, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1 - person_event SPRITE_SUPER_NERD, 27, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1 - person_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundPathSwitchRoomEntrancesSmokeBall, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL - person_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundPathSwitchRoomEntrancesFullHeal, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_FULL_HEAL - person_event SPRITE_SILVER, 3, 23, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_UNDERGROUND_PATH + object_event SPRITE_PHARMACIST, 12, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_PHARMACIST, 8, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 2, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET_GIRL, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_TEACHER, 27, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1 + object_event SPRITE_SUPER_NERD, 27, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1 + object_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UndergroundPathSwitchRoomEntrancesSmokeBall, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL + object_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UndergroundPathSwitchRoomEntrancesFullHeal, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_FULL_HEAL + object_event SPRITE_SILVER, 3, 23, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_UNDERGROUND_PATH diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index 7876d0557..d8f4adf2f 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -8,7 +8,7 @@ const_value set 2 const UNDERGROUNDWAREHOUSE_POKE_BALL3 UndergroundWarehouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -220,18 +220,18 @@ UndergroundWarehouse_MapEventHeader: warp_def $c, $3, 3, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES warp_def $2, $11, 1, GOLDENROD_DEPT_STORE_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_ROCKET, 8, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 3, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_GENTLEMAN, 8, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_POKE_BALL, 15, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundWarehouseMaxEther, EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER - person_event SPRITE_POKE_BALL, 9, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundWarehouseTMSleepTalk, EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK - person_event SPRITE_POKE_BALL, 1, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundWarehouseUltraBall, EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL + object_event SPRITE_ROCKET, 8, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 3, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_GENTLEMAN, 8, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_POKE_BALL, 15, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UndergroundWarehouseMaxEther, EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER + object_event SPRITE_POKE_BALL, 9, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UndergroundWarehouseTMSleepTalk, EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK + object_event SPRITE_POKE_BALL, 1, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UndergroundWarehouseUltraBall, EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 0879a120c..54200c8d8 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -10,7 +10,7 @@ const_value set 2 const UNIONCAVE1F_POKE_BALL4 UnionCave1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -210,20 +210,20 @@ UnionCave1F_MapEventHeader: warp_def $1f, $11, 1, ROUTE_33 warp_def $3, $11, 4, ROUTE_32 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_POKEFAN_M, 6, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerDaniel, -1 - person_event SPRITE_SUPER_NERD, 21, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1 - person_event SPRITE_POKEFAN_M, 8, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 1, TrainerHikerRussell, -1 - person_event SPRITE_FISHER, 27, 15, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerFirebreatherRay, -1 - person_event SPRITE_FISHER, 19, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerFirebreatherBill, -1 - person_event SPRITE_POKE_BALL, 21, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FGreatBall, EVENT_UNION_CAVE_1F_GREAT_BALL - person_event SPRITE_POKE_BALL, 2, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK - person_event SPRITE_POKE_BALL, 17, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION - person_event SPRITE_POKE_BALL, 33, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FAwakening, EVENT_UNION_CAVE_1F_AWAKENING + object_event SPRITE_POKEFAN_M, 6, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerDaniel, -1 + object_event SPRITE_SUPER_NERD, 21, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1 + object_event SPRITE_POKEFAN_M, 8, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerRussell, -1 + object_event SPRITE_FISHER, 27, 15, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerFirebreatherRay, -1 + object_event SPRITE_FISHER, 19, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerFirebreatherBill, -1 + object_event SPRITE_POKE_BALL, 21, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FGreatBall, EVENT_UNION_CAVE_1F_GREAT_BALL + object_event SPRITE_POKE_BALL, 2, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK + object_event SPRITE_POKE_BALL, 17, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION + object_event SPRITE_POKE_BALL, 33, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FAwakening, EVENT_UNION_CAVE_1F_AWAKENING diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index a11702651..e3c7ac5f0 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -8,7 +8,7 @@ const_value set 2 const UNIONCAVEB1F_POKE_BALL2 UnionCaveB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -164,18 +164,18 @@ UnionCaveB1F_MapEventHeader: warp_def $21, $3, 2, UNION_CAVE_1F warp_def $1f, $11, 1, UNION_CAVE_B2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_POKEFAN_M, 4, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerPhillip, -1 - person_event SPRITE_POKEFAN_M, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerLeonard, -1 - person_event SPRITE_SUPER_NERD, 32, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1 - person_event SPRITE_SUPER_NERD, 30, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacCalvin, -1 - person_event SPRITE_POKE_BALL, 16, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB1FTMSwift, EVENT_UNION_CAVE_B1F_TM_SWIFT - person_event SPRITE_BOULDER, 10, 7, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, UnionCaveB1FBoulder, -1 - person_event SPRITE_POKE_BALL, 23, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB1FXDefend, EVENT_UNION_CAVE_B1F_X_DEFEND + object_event SPRITE_POKEFAN_M, 4, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerPhillip, -1 + object_event SPRITE_POKEFAN_M, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerLeonard, -1 + object_event SPRITE_SUPER_NERD, 32, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1 + object_event SPRITE_SUPER_NERD, 30, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacCalvin, -1 + object_event SPRITE_POKE_BALL, 16, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FTMSwift, EVENT_UNION_CAVE_B1F_TM_SWIFT + object_event SPRITE_BOULDER, 10, 7, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, UnionCaveB1FBoulder, -1 + object_event SPRITE_POKE_BALL, 23, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FXDefend, EVENT_UNION_CAVE_B1F_X_DEFEND diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 6ad0ff78e..b08424670 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -7,7 +7,7 @@ const_value set 2 const UNIONCAVEB2F_LAPRAS UnionCaveB2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -149,17 +149,17 @@ UnionCaveB2F_MapEventHeader: db 1 warp_def $3, $5, 5, UNION_CAVE_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_ROCKER, 19, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermNick, -1 - person_event SPRITE_COOLTRAINER_F, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1 - person_event SPRITE_COOLTRAINER_F, 30, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1 - person_event SPRITE_POKE_BALL, 2, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER - person_event SPRITE_POKE_BALL, 19, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION - person_event SPRITE_SURF, 31, 11, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS + object_event SPRITE_ROCKER, 19, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermNick, -1 + object_event SPRITE_COOLTRAINER_F, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1 + object_event SPRITE_COOLTRAINER_F, 30, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1 + object_event SPRITE_POKE_BALL, 2, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER + object_event SPRITE_POKE_BALL, 19, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION + object_event SPRITE_SURF, 31, 11, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 405f450b3..e9a683162 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -7,7 +7,7 @@ const_value set 2 const VERMILIONCITY_POKEFAN_M VermilionCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -284,25 +284,25 @@ VermilionCity_MapEventHeader: warp_def $1f, $14, 2, VERMILION_PORT_PASSAGE warp_def $7, $22, 1, DIGLETTS_CAVE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 8 - signpost 3, 25, SIGNPOST_READ, VermilionCitySign - signpost 19, 5, SIGNPOST_READ, VermilionGymSign - signpost 13, 5, SIGNPOST_READ, PokemonFanClubSign - signpost 9, 33, SIGNPOST_READ, VermilionCityDiglettsCaveSign - signpost 15, 27, SIGNPOST_READ, VermilionCityPortSign - signpost 5, 10, SIGNPOST_READ, VermilionCityPokecenterSign - signpost 13, 22, SIGNPOST_READ, VermilionCityMartSign - signpost 19, 12, SIGNPOST_ITEM, VermilionCityHiddenFullHeal + bg_event 3, 25, BGEVENT_READ, VermilionCitySign + bg_event 19, 5, BGEVENT_READ, VermilionGymSign + bg_event 13, 5, BGEVENT_READ, PokemonFanClubSign + bg_event 9, 33, BGEVENT_READ, VermilionCityDiglettsCaveSign + bg_event 15, 27, BGEVENT_READ, VermilionCityPortSign + bg_event 5, 10, BGEVENT_READ, VermilionCityPokecenterSign + bg_event 13, 22, BGEVENT_READ, VermilionCityMartSign + bg_event 19, 12, BGEVENT_ITEM, VermilionCityHiddenFullHeal -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_TEACHER, 9, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1 - person_event SPRITE_GRAMPS, 6, 23, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionMachopOwner, -1 - person_event SPRITE_MACHOP, 7, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, VermilionMachop, -1 - person_event SPRITE_SUPER_NERD, 16, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VermilionCitySuperNerdScript, -1 - person_event SPRITE_BIG_SNORLAX, 8, 34, SPRITEMOVEDATA_SNORLAX, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX - person_event SPRITE_POKEFAN_M, 12, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VermilionGymBadgeGuy, -1 + object_event SPRITE_TEACHER, 9, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1 + object_event SPRITE_GRAMPS, 6, 23, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1 + object_event SPRITE_MACHOP, 7, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1 + object_event SPRITE_SUPER_NERD, 16, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionCitySuperNerdScript, -1 + object_event SPRITE_BIG_SNORLAX, 8, 34, SPRITEMOVEDATA_SNORLAX, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX + object_event SPRITE_POKEFAN_M, 12, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionGymBadgeGuy, -1 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index e98ebb848..3bd2a6590 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -6,7 +6,7 @@ const_value set 2 const VERMILIONGYM_GYM_GUY VermilionGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -269,33 +269,33 @@ VermilionGym_MapEventHeader: warp_def $11, $4, 7, VERMILION_CITY warp_def $11, $5, 7, VERMILION_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 17 - signpost 7, 1, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 7, 3, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 7, 5, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 7, 7, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 7, 9, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 9, 1, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 9, 3, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 9, 5, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 9, 7, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 9, 9, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 11, 1, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 11, 3, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 11, 5, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 11, 7, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 11, 9, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 15, 3, SIGNPOST_READ, VermilionGymStatue - signpost 15, 6, SIGNPOST_READ, VermilionGymStatue + bg_event 7, 1, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 7, 3, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 7, 5, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 7, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 7, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 9, 1, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 9, 3, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 9, 5, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 9, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 9, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 11, 1, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 11, 3, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 11, 5, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 11, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 11, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 15, 3, BGEVENT_READ, VermilionGymStatue + bg_event 15, 6, BGEVENT_READ, VermilionGymStatue -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_SURGE, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1 - person_event SPRITE_GENTLEMAN, 8, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerGentlemanGregory, -1 - person_event SPRITE_ROCKER, 7, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 3, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerGuitaristVincent, -1 - person_event SPRITE_SUPER_NERD, 10, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerJugglerHorton, -1 - person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 1, VermilionGymGuyScript, -1 + object_event SPRITE_SURGE, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1 + object_event SPRITE_GENTLEMAN, 8, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1 + object_event SPRITE_ROCKER, 7, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 3, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1 + object_event SPRITE_SUPER_NERD, 10, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerJugglerHorton, -1 + object_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, VermilionGymGuyScript, -1 diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm index b7440fcd7..0901e7670 100644 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const VERMILIONHOUSEDIGLETTSCAVESPEECHHOUSE_GENTLEMAN VermilionHouseDiglettsCaveSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -29,12 +29,12 @@ VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader: warp_def $7, $2, 6, VERMILION_CITY warp_def $7, $3, 6, VERMILION_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_GENTLEMAN, 3, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VermilionHouseDiglettsCaveSpeechHouseGentlemanScript, -1 + object_event SPRITE_GENTLEMAN, 3, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionHouseDiglettsCaveSpeechHouseGentlemanScript, -1 diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm index 83d7dfd4e..58a058aa1 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionHouseFishingSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const VERMILIONHOUSEFISHINGSPEECHHOUSE_FISHING_GURU VermilionHouseFishingSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -59,13 +59,13 @@ VermilionHouseFishingSpeechHouse_MapEventHeader: warp_def $7, $2, 1, VERMILION_CITY warp_def $7, $3, 1, VERMILION_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 0, 3, SIGNPOST_READ, FishingDudesHousePhoto + bg_event 0, 3, BGEVENT_READ, FishingDudesHousePhoto -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHING_GURU, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FishingDude, -1 + object_event SPRITE_FISHING_GURU, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingDude, -1 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index 1d94b09a9..7c5359ae3 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER VermilionMagnetTrainSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -42,15 +42,15 @@ VermilionMagnetTrainSpeechHouse_MapEventHeader: warp_def $7, $2, 4, VERMILION_CITY warp_def $7, $3, 4, VERMILION_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, VermilionMagnetTrainSpeechHouseBookshelf - signpost 1, 1, SIGNPOST_READ, VermilionMagnetTrainSpeechHouseBookshelf + bg_event 1, 0, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1 - person_event SPRITE_YOUNGSTER, 3, 0, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1 + object_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1 + object_event SPRITE_YOUNGSTER, 3, 0, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index 71a7d601f..0825c71d8 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -4,7 +4,7 @@ const_value set 2 const VERMILIONMART_BUENA VermilionMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -45,14 +45,14 @@ VermilionMart_MapEventHeader: warp_def $7, $2, 5, VERMILION_CITY warp_def $7, $3, 5, VERMILION_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1 - person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1 - person_event SPRITE_BUENA, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1 + object_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1 + object_event SPRITE_BUENA, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1 diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm index 1a6e6b905..3cc524994 100644 --- a/maps/VermilionPokecenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const VERMILIONPOKECENTER1F_BUG_CATCHER VermilionPokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -86,15 +86,15 @@ VermilionPokecenter1F_MapEventHeader: warp_def $7, $4, 2, VERMILION_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x191603, -1 - person_event SPRITE_FISHING_GURU, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1 - person_event SPRITE_SAILOR, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1 - person_event SPRITE_BUG_CATCHER, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VermilionPokecenter1FBugCatcherScript, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x191603, -1 + object_event SPRITE_FISHING_GURU, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1 + object_event SPRITE_SAILOR, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1 + object_event SPRITE_BUG_CATCHER, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FBugCatcherScript, -1 diff --git a/maps/VermilionPokecenter2FBeta.asm b/maps/VermilionPokecenter2FBeta.asm index 9a9aeec2c..0fa256231 100644 --- a/maps/VermilionPokecenter2FBeta.asm +++ b/maps/VermilionPokecenter2FBeta.asm @@ -1,5 +1,5 @@ VermilionPokecenter2FBeta_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -13,11 +13,11 @@ VermilionPokecenter2FBeta_MapEventHeader: db 1 warp_def $7, $0, 3, VERMILION_POKECENTER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index dd88f911d..011f1560e 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -4,16 +4,16 @@ const_value set 2 const VERMILIONPORT_SUPER_NERD VermilionPort_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .LeaveFastShip + scene_script .DummyScene0 + scene_script .LeaveFastShip .MapCallbacks: db 1 dbw MAPCALLBACK_NEWMAP, .FlyPoint -.DummyTrigger0: +.DummyScene0: end .LeaveFastShip: @@ -27,7 +27,7 @@ VermilionPort_MapScriptHeader: .LeaveFastShipScript: applymovement PLAYER, MovementData_0x74ef3 appear VERMILIONPORT_SAILOR1 - dotrigger $0 + setscene $0 setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 setevent EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP @@ -68,7 +68,7 @@ SailorScript_0x74dc4: clearevent EVENT_BEAT_SCHOOLBOY_RICKY setevent EVENT_FAST_SHIP_DESTINATION_OLIVINE appear VERMILIONPORT_SAILOR1 - domaptrigger FAST_SHIP_1F, $1 + setmapscene FAST_SHIP_1F, $1 warp FAST_SHIP_1F, $19, $1 end @@ -308,16 +308,16 @@ VermilionPort_MapEventHeader: warp_def $5, $9, 5, VERMILION_PORT_PASSAGE warp_def $11, $7, 1, FAST_SHIP_1F -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $b, $7, UnknownScript_0x74e20 + coord_event 0, $b, $7, UnknownScript_0x74e20 -.Signposts: +.BGEvents: db 1 - signpost 13, 16, SIGNPOST_ITEM, VermilionPortHiddenIron + bg_event 13, 16, BGEVENT_ITEM, VermilionPortHiddenIron -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_SAILOR, 17, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY - person_event SPRITE_SAILOR, 11, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x74e97, -1 - person_event SPRITE_SUPER_NERD, 11, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1 + object_event SPRITE_SAILOR, 17, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY + object_event SPRITE_SAILOR, 11, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1 + object_event SPRITE_SUPER_NERD, 11, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 028bb6094..1b6aa8ac1 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -2,7 +2,7 @@ const_value set 2 const VERMILIONPORTPASSAGE_TEACHER VermilionPortPassage_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -30,12 +30,12 @@ VermilionPortPassage_MapEventHeader: warp_def $2, $3, 3, VERMILION_PORT_PASSAGE warp_def $e, $3, 1, VERMILION_PORT -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_TEACHER, 1, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1 + object_event SPRITE_TEACHER, 1, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 2890977dc..a2533a2ed 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -7,22 +7,22 @@ const_value set 2 const VICTORYROAD_POKE_BALL5 VictoryRoad_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end UnknownScript_0x74492: - moveperson VICTORYROAD_SILVER, $12, $b + moveobject VICTORYROAD_SILVER, $12, $b spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic @@ -32,7 +32,7 @@ UnknownScript_0x74492: scall UnknownScript_0x744d4 applymovement VICTORYROAD_SILVER, MovementData_0x7454c disappear VICTORYROAD_SILVER - dotrigger $1 + setscene $1 playmapmusic end @@ -46,7 +46,7 @@ UnknownScript_0x744b5: scall UnknownScript_0x744d4 applymovement VICTORYROAD_SILVER, MovementData_0x74555 disappear VICTORYROAD_SILVER - dotrigger $1 + setscene $1 playmapmusic end @@ -257,21 +257,21 @@ VictoryRoad_MapEventHeader: warp_def $1b, $0, 8, VICTORY_ROAD warp_def $5, $d, 3, ROUTE_23 -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $8, $c, UnknownScript_0x74492 - xy_trigger 0, $8, $d, UnknownScript_0x744b5 + coord_event 0, $8, $c, UnknownScript_0x74492 + coord_event 0, $8, $d, UnknownScript_0x744b5 -.Signposts: +.BGEvents: db 2 - signpost 29, 3, SIGNPOST_ITEM, VictoryRoadHiddenMaxPotion - signpost 65, 3, SIGNPOST_ITEM, VictoryRoadHiddenFullHeal + bg_event 29, 3, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion + bg_event 65, 3, BGEVENT_ITEM, VictoryRoadHiddenFullHeal -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_SILVER, 13, 18, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD - person_event SPRITE_POKE_BALL, 28, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE - person_event SPRITE_POKE_BALL, 48, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE - person_event SPRITE_POKE_BALL, 29, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE - person_event SPRITE_POKE_BALL, 48, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL - person_event SPRITE_POKE_BALL, 38, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP + object_event SPRITE_SILVER, 13, 18, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD + object_event SPRITE_POKE_BALL, 28, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE + object_event SPRITE_POKE_BALL, 48, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE + object_event SPRITE_POKE_BALL, 29, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE + object_event SPRITE_POKE_BALL, 48, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL + object_event SPRITE_POKE_BALL, 38, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index dbfbafb09..10bc70b99 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -4,21 +4,21 @@ const_value set 2 const VICTORYROADGATE_BLACK_BELT2 VictoryRoadGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end -VictoryRoadGateBadgeCheckTrigger: +VictoryRoadGateBadgeCheckScene: spriteface PLAYER, LEFT jump VictoryRoadGateBadgeCheckScript @@ -40,7 +40,7 @@ VictoryRoadGateBadgeCheckScript: writetext VictoryRoadGateEightBadgesText waitbutton closetext - dotrigger $1 + setscene $1 end VictoryRoadGateLeftBlackBeltScript: @@ -112,15 +112,15 @@ VictoryRoadGate_MapEventHeader: warp_def $7, $1, 2, ROUTE_28 warp_def $7, $2, 2, ROUTE_28 -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $b, $a, VictoryRoadGateBadgeCheckTrigger + coord_event 0, $b, $a, VictoryRoadGateBadgeCheckScene -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_OFFICER, 11, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1 - person_event SPRITE_BLACK_BELT, 5, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER - person_event SPRITE_BLACK_BELT, 5, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX + object_event SPRITE_OFFICER, 11, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1 + object_event SPRITE_BLACK_BELT, 5, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER + object_event SPRITE_BLACK_BELT, 5, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 93a71312a..e6ff519a4 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -9,7 +9,7 @@ const_value set 2 const VIOLETCITY_POKE_BALL2 VioletCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -294,26 +294,26 @@ VioletCity_MapEventHeader: warp_def $18, $27, 1, ROUTE_31_VIOLET_GATE warp_def $19, $27, 2, ROUTE_31_VIOLET_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 7 - signpost 20, 24, SIGNPOST_READ, VioletCitySign - signpost 17, 15, SIGNPOST_READ, VioletGymSign - signpost 8, 24, SIGNPOST_READ, SproutTowerSign - signpost 17, 27, SIGNPOST_READ, EarlsPokemonAcademySign - signpost 25, 32, SIGNPOST_READ, VioletCityPokecenterSign - signpost 17, 10, SIGNPOST_READ, VioletCityMartSign - signpost 14, 37, SIGNPOST_ITEM, VioletCityHiddenHyperPotion + bg_event 20, 24, BGEVENT_READ, VioletCitySign + bg_event 17, 15, BGEVENT_READ, VioletGymSign + bg_event 8, 24, BGEVENT_READ, SproutTowerSign + bg_event 17, 27, BGEVENT_READ, EarlsPokemonAcademySign + bg_event 25, 32, BGEVENT_READ, VioletCityPokecenterSign + bg_event 17, 10, BGEVENT_READ, VioletCityMartSign + bg_event 14, 37, BGEVENT_ITEM, VioletCityHiddenHyperPotion -.PersonEvents: +.ObjectEvents: db 8 - person_event SPRITE_FISHER, 16, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL - person_event SPRITE_LASS, 28, 28, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityLassScript, -1 - person_event SPRITE_SUPER_NERD, 14, 24, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1 - person_event SPRITE_GRAMPS, 20, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletCityGrampsScript, -1 - person_event SPRITE_YOUNGSTER, 18, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1 - person_event SPRITE_FRUIT_TREE, 29, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1 - person_event SPRITE_POKE_BALL, 1, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP - person_event SPRITE_POKE_BALL, 5, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY + object_event SPRITE_FISHER, 16, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL + object_event SPRITE_LASS, 28, 28, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityLassScript, -1 + object_event SPRITE_SUPER_NERD, 14, 24, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1 + object_event SPRITE_GRAMPS, 20, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityGrampsScript, -1 + object_event SPRITE_YOUNGSTER, 18, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1 + object_event SPRITE_FRUIT_TREE, 29, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1 + object_event SPRITE_POKE_BALL, 1, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP + object_event SPRITE_POKE_BALL, 5, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index b98a789a5..a40fe33db 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -5,7 +5,7 @@ const_value set 2 const VIOLETGYM_GYM_GUY VioletGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -30,13 +30,13 @@ FalknerScript_0x683c2: waitsfx setflag ENGINE_ZEPHYRBADGE checkcode VAR_BADGES - scall VioletGymTriggerRockets + scall VioletGymActivateRockets .FightDone: checkevent EVENT_GOT_TM31_MUD_SLAP iftrue .SpeechAfterTM setevent EVENT_BEAT_BIRD_KEEPER_ROD setevent EVENT_BEAT_BIRD_KEEPER_ABE - domaptrigger ELMS_LAB, $2 + setmapscene ELMS_LAB, $2 specialphonecall SPECIALCALL_ASSISTANT writetext UnknownText_0x685c8 buttonsound @@ -55,7 +55,7 @@ FalknerScript_0x683c2: closetext end -VioletGymTriggerRockets: +VioletGymActivateRockets: if_equal 7, .RadioTowerRockets if_equal 6, .GoldenrodRockets end @@ -290,17 +290,17 @@ VioletGym_MapEventHeader: warp_def $f, $4, 2, VIOLET_CITY warp_def $f, $5, 2, VIOLET_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 13, 3, SIGNPOST_READ, VioletGymStatue - signpost 13, 6, SIGNPOST_READ, VioletGymStatue + bg_event 13, 3, BGEVENT_READ, VioletGymStatue + bg_event 13, 6, BGEVENT_READ, VioletGymStatue -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_FALKNER, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1 - person_event SPRITE_YOUNGSTER, 6, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperRod, -1 - person_event SPRITE_YOUNGSTER, 10, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperAbe, -1 - person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VioletGymGuyScript, -1 + object_event SPRITE_FALKNER, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1 + object_event SPRITE_YOUNGSTER, 6, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperRod, -1 + object_event SPRITE_YOUNGSTER, 10, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperAbe, -1 + object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1 diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm index de6a1edf8..fb3bfc5d5 100644 --- a/maps/VioletKylesHouse.asm +++ b/maps/VioletKylesHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const VIOLETKYLESHOUSE_KYLE VioletKylesHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -41,13 +41,13 @@ VioletKylesHouse_MapEventHeader: warp_def $7, $3, 6, VIOLET_CITY warp_def $7, $4, 6, VIOLET_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1 - person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Kyle, -1 + object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1 + object_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Kyle, -1 diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index db6790bfe..c28c00869 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -4,7 +4,7 @@ const_value set 2 const VIOLETMART_COOLTRAINER_M VioletMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -57,14 +57,14 @@ VioletMart_MapEventHeader: warp_def $7, $2, 1, VIOLET_CITY warp_def $7, $3, 1, VIOLET_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x68295, -1 - person_event SPRITE_GRANNY, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletMartGrannyScript, -1 - person_event SPRITE_COOLTRAINER_M, 2, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x68295, -1 + object_event SPRITE_GRANNY, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1 + object_event SPRITE_COOLTRAINER_M, 2, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 61f95bb0b..14cdb7c0f 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -4,7 +4,7 @@ const_value set 2 const VIOLETNICKNAMESPEECHHOUSE_BIRD VioletNicknameSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -53,14 +53,14 @@ VioletNicknameSpeechHouse_MapEventHeader: warp_def $7, $3, 4, VIOLET_CITY warp_def $7, $4, 4, VIOLET_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1 - person_event SPRITE_LASS, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1 - person_event SPRITE_BIRD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, BirdScript_0x693ef, -1 + object_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1 + object_event SPRITE_LASS, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1 + object_event SPRITE_BIRD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BirdScript_0x693ef, -1 diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index f871a5977..8ddef8239 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -6,7 +6,7 @@ const_value set 2 const VIOLETPOKECENTER1F_SCIENTIST VioletPokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -32,7 +32,7 @@ VioletPokecenter1F_ElmsAideScript: setevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE clearevent EVENT_ELMS_AIDE_IN_LAB clearevent EVENT_TOGEPI_HATCHED - domaptrigger ROUTE_32, $1 + setmapscene ROUTE_32, $1 writetext UnknownText_0x695c5 waitbutton closetext @@ -225,16 +225,16 @@ VioletPokecenter1F_MapEventHeader: warp_def $7, $4, 5, VIOLET_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 5 - 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, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1 - person_event SPRITE_GENTLEMAN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1 - person_event SPRITE_YOUNGSTER, 1, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VioletPokecenter1FYoungsterScript, -1 - person_event SPRITE_SCIENTIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenterNurse, -1 + object_event SPRITE_GAMEBOY_KID, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1 + object_event SPRITE_GENTLEMAN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1 + object_event SPRITE_YOUNGSTER, 1, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FYoungsterScript, -1 + object_event SPRITE_SCIENTIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 3b4ce8f33..df827c91a 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -5,7 +5,7 @@ const_value set 2 const VIRIDIANCITY_YOUNGSTER ViridianCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -227,21 +227,21 @@ ViridianCity_MapEventHeader: warp_def $13, $1d, 2, VIRIDIAN_MART warp_def $19, $17, 1, VIRIDIAN_POKECENTER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 17, 17, SIGNPOST_READ, ViridianCitySign - signpost 7, 27, SIGNPOST_READ, ViridianGymSign - signpost 1, 19, SIGNPOST_READ, ViridianCityWelcomeSign - signpost 15, 21, SIGNPOST_READ, TrainerHouseSign - signpost 25, 24, SIGNPOST_READ, ViridianCityPokecenterSign - signpost 19, 30, SIGNPOST_READ, ViridianCityMartSign + bg_event 17, 17, BGEVENT_READ, ViridianCitySign + bg_event 7, 27, BGEVENT_READ, ViridianGymSign + bg_event 1, 19, BGEVENT_READ, ViridianCityWelcomeSign + bg_event 15, 21, BGEVENT_READ, TrainerHouseSign + bg_event 25, 24, BGEVENT_READ, ViridianCityPokecenterSign + bg_event 19, 30, BGEVENT_READ, ViridianCityMartSign -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_GRAMPS, 5, 18, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9a4c, -1 - person_event SPRITE_GRAMPS, 8, 30, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9a61, -1 - person_event SPRITE_FISHER, 23, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a9a75, -1 - person_event SPRITE_YOUNGSTER, 21, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ViridianCityYoungsterScript, -1 + object_event SPRITE_GRAMPS, 5, 18, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x1a9a4c, -1 + object_event SPRITE_GRAMPS, 8, 30, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x1a9a61, -1 + object_event SPRITE_FISHER, 23, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a9a75, -1 + object_event SPRITE_YOUNGSTER, 21, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianCityYoungsterScript, -1 diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 7bb9b2d98..3be7a126e 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -3,7 +3,7 @@ const_value set 2 const VIRIDIANGYM_GYM_GUY ViridianGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -178,15 +178,15 @@ ViridianGym_MapEventHeader: warp_def $11, $4, 1, VIRIDIAN_CITY warp_def $11, $5, 1, VIRIDIAN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 13, 3, SIGNPOST_READ, ViridianGymStatue - signpost 13, 6, SIGNPOST_READ, ViridianGymStatue + bg_event 13, 3, BGEVENT_READ, ViridianGymStatue + bg_event 13, 6, BGEVENT_READ, ViridianGymStatue -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_BLUE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE - person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE + object_event SPRITE_BLUE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE + object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index dbb1e8d09..c2235496a 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -4,7 +4,7 @@ const_value set 2 const VIRIDIANMART_COOLTRAINER_M ViridianMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -45,14 +45,14 @@ ViridianMart_MapEventHeader: warp_def $7, $2, 4, VIRIDIAN_CITY warp_def $7, $3, 4, VIRIDIAN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1 - person_event SPRITE_LASS, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ViridianMartLassScript, -1 - person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1 + object_event SPRITE_LASS, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1 + object_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1 diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 9c402b327..f5df4ad2f 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -5,7 +5,7 @@ const_value set 2 const VIRIDIANNICKNAMESPEECHHOUSE_RATTEY ViridianNicknameSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -70,15 +70,15 @@ ViridianNicknameSpeechHouse_MapEventHeader: warp_def $7, $2, 2, VIRIDIAN_CITY warp_def $7, $3, 2, VIRIDIAN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_POKEFAN_M, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1 - person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1 - person_event SPRITE_MOLTRES, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, Speary, -1 - person_event SPRITE_GROWLITHE, 3, 6, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Rattey, -1 + object_event SPRITE_POKEFAN_M, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1 + object_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1 + object_event SPRITE_MOLTRES, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Speary, -1 + object_event SPRITE_GROWLITHE, 3, 6, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Rattey, -1 diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm index 2db55de00..213e64962 100644 --- a/maps/ViridianPokecenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const VIRIDIANPOKECENTER1F_BUG_CATCHER ViridianPokecenter1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -81,15 +81,15 @@ ViridianPokecenter1F_MapEventHeader: warp_def $7, $4, 5, VIRIDIAN_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x9b690, -1 - person_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1 - person_event SPRITE_COOLTRAINER_F, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1 - person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ViridianPokecenter1FBugCatcherScript, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9b690, -1 + object_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1 + object_event SPRITE_COOLTRAINER_F, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1 + object_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FBugCatcherScript, -1 diff --git a/maps/ViridianPokecenter2FBeta.asm b/maps/ViridianPokecenter2FBeta.asm index 84551d7f2..037160cb3 100644 --- a/maps/ViridianPokecenter2FBeta.asm +++ b/maps/ViridianPokecenter2FBeta.asm @@ -1,5 +1,5 @@ ViridianPokecenter2FBeta_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -13,11 +13,11 @@ ViridianPokecenter2FBeta_MapEventHeader: db 1 warp_def $7, $0, 3, VIRIDIAN_POKECENTER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 9028ccb8f..90a7fd8f6 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -10,7 +10,7 @@ const_value set 2 const WAREHOUSEENTRANCE_GRANNY WarehouseEntrance_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -662,25 +662,25 @@ WarehouseEntrance_MapEventHeader: warp_def $1f, $16, 3, WAREHOUSE_ENTRANCE warp_def $1b, $16, 1, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 5 - signpost 6, 18, SIGNPOST_READ, BasementDoorScript - signpost 6, 19, SIGNPOST_READ, MapWarehouseEntranceSignpost1Script - signpost 13, 6, SIGNPOST_ITEM, WarehouseEntranceHiddenParlyzHeal - signpost 18, 4, SIGNPOST_ITEM, WarehouseEntranceHiddenSuperPotion - signpost 8, 17, SIGNPOST_ITEM, WarehouseEntranceHiddenAntidote + bg_event 6, 18, BGEVENT_READ, BasementDoorScript + bg_event 6, 19, BGEVENT_READ, MapWarehouseEntranceSignpost1Script + bg_event 13, 6, BGEVENT_ITEM, WarehouseEntranceHiddenParlyzHeal + bg_event 18, 4, BGEVENT_ITEM, WarehouseEntranceHiddenSuperPotion + bg_event 8, 17, BGEVENT_ITEM, WarehouseEntranceHiddenAntidote -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_SUPER_NERD, 31, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerSupernerdEric, -1 - person_event SPRITE_SUPER_NERD, 9, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerSupernerdTeru, -1 - person_event SPRITE_SUPER_NERD, 27, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1 - person_event SPRITE_SUPER_NERD, 6, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1 - person_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WarehouseEntranceCoinCase, EVENT_WAREHOUSE_ENTRANCE_COIN_CASE - person_event SPRITE_GRAMPS, 11, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_WAREHOUSE_ENTRANCE_GRAMPS - person_event SPRITE_SUPER_NERD, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER - person_event SPRITE_SUPER_NERD, 15, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER - person_event SPRITE_GRANNY, 21, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_WAREHOUSE_ENTRANCE_GRANNY + object_event SPRITE_SUPER_NERD, 31, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdEric, -1 + object_event SPRITE_SUPER_NERD, 9, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1 + object_event SPRITE_SUPER_NERD, 27, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1 + object_event SPRITE_SUPER_NERD, 6, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1 + object_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WarehouseEntranceCoinCase, EVENT_WAREHOUSE_ENTRANCE_COIN_CASE + object_event SPRITE_GRAMPS, 11, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_WAREHOUSE_ENTRANCE_GRAMPS + object_event SPRITE_SUPER_NERD, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER + object_event SPRITE_SUPER_NERD, 15, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER + object_event SPRITE_GRANNY, 21, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_WAREHOUSE_ENTRANCE_GRANNY diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index bc6e06e6d..be315317c 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -7,7 +7,7 @@ const_value set 2 const WHIRLISLANDB1F_BOULDER WhirlIslandB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -59,20 +59,20 @@ WhirlIslandB1F_MapEventHeader: warp_def $1b, $d, 2, WHIRL_ISLAND_B2F warp_def $15, $11, 1, WHIRL_ISLAND_CAVE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 4, 30, SIGNPOST_ITEM, WhirlIslandB1FHiddenRareCandy - signpost 18, 36, SIGNPOST_ITEM, WhirlIslandB1FHiddenUltraBall - signpost 23, 2, SIGNPOST_ITEM, WhirlIslandB1FHiddenFullRestore + bg_event 4, 30, BGEVENT_ITEM, WhirlIslandB1FHiddenRareCandy + bg_event 18, 36, BGEVENT_ITEM, WhirlIslandB1FHiddenUltraBall + bg_event 23, 2, BGEVENT_ITEM, WhirlIslandB1FHiddenFullRestore -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE - person_event SPRITE_POKE_BALL, 18, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS - person_event SPRITE_POKE_BALL, 23, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM - person_event SPRITE_POKE_BALL, 8, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET - person_event SPRITE_POKE_BALL, 26, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FEscapeRope, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE - person_event SPRITE_BOULDER, 26, 23, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WhirlIslandB1FBoulder, -1 + object_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE + object_event SPRITE_POKE_BALL, 18, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS + object_event SPRITE_POKE_BALL, 23, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM + object_event SPRITE_POKE_BALL, 8, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET + object_event SPRITE_POKE_BALL, 26, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FEscapeRope, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE + object_event SPRITE_BOULDER, 26, 23, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhirlIslandB1FBoulder, -1 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index 0ff3a9e78..c8cda6d8f 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -4,7 +4,7 @@ const_value set 2 const WHIRLISLANDB2F_POKE_BALL3 WhirlIslandB2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -30,14 +30,14 @@ WhirlIslandB2F_MapEventHeader: warp_def $19, $7, 1, WHIRL_ISLAND_LUGIA_CHAMBER warp_def $1f, $d, 5, WHIRL_ISLAND_SW -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_POKE_BALL, 11, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE - person_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE - person_event SPRITE_POKE_BALL, 12, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER + object_event SPRITE_POKE_BALL, 11, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE + object_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE + object_event SPRITE_POKE_BALL, 12, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index 3b2b6f0e7..c46746119 100644 --- a/maps/WhirlIslandCave.asm +++ b/maps/WhirlIslandCave.asm @@ -1,5 +1,5 @@ WhirlIslandCave_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -14,11 +14,11 @@ WhirlIslandCave_MapEventHeader: warp_def $5, $7, 9, WHIRL_ISLAND_B1F warp_def $d, $3, 4, WHIRL_ISLAND_NW -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index c71817cfc..86402b6ab 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -2,7 +2,7 @@ const_value set 2 const WHIRLISLANDLUGIACHAMBER_LUGIA WhirlIslandLugiaChamber_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -51,12 +51,12 @@ WhirlIslandLugiaChamber_MapEventHeader: db 1 warp_def $d, $9, 3, WHIRL_ISLAND_B2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_LUGIA, 5, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA + object_event SPRITE_LUGIA, 5, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index 9da9eaeaf..fa3b019fd 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -2,7 +2,7 @@ const_value set 2 const WHIRLISLANDNE_POKE_BALL WhirlIslandNE_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -21,12 +21,12 @@ WhirlIslandNE_MapEventHeader: warp_def $3, $11, 2, WHIRL_ISLAND_B1F warp_def $b, $d, 3, WHIRL_ISLAND_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKE_BALL, 11, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL + object_event SPRITE_POKE_BALL, 11, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index 60eafae8e..ce64f2154 100644 --- a/maps/WhirlIslandNW.asm +++ b/maps/WhirlIslandNW.asm @@ -1,5 +1,5 @@ WhirlIslandNW_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -16,11 +16,11 @@ WhirlIslandNW_MapEventHeader: warp_def $f, $3, 4, WHIRL_ISLAND_SW warp_def $f, $7, 2, WHIRL_ISLAND_CAVE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index 32cad9594..7e03568d1 100644 --- a/maps/WhirlIslandSE.asm +++ b/maps/WhirlIslandSE.asm @@ -1,5 +1,5 @@ WhirlIslandSE_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -14,11 +14,11 @@ WhirlIslandSE_MapEventHeader: warp_def $d, $5, 4, ROUTE_41 warp_def $3, $5, 6, WHIRL_ISLAND_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index 1902ecbfd..c66f05245 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -2,7 +2,7 @@ const_value set 2 const WHIRLISLANDSW_POKE_BALL WhirlIslandSW_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -23,12 +23,12 @@ WhirlIslandSW_MapEventHeader: warp_def $f, $3, 3, WHIRL_ISLAND_NW warp_def $f, $11, 4, WHIRL_ISLAND_B2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL + object_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index ce539ac59..55b132356 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -2,10 +2,10 @@ const_value set 2 const WILLSROOM_WILL WillsRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .LockDoor - maptrigger .DummyTrigger + scene_script .LockDoor + scene_script .DummyScene .MapCallbacks: db 1 @@ -15,7 +15,7 @@ WillsRoom_MapScriptHeader: priorityjump .WillsDoorLocksBehindYou end -.DummyTrigger: +.DummyScene: end .WillsRoomDoors: @@ -37,7 +37,7 @@ WillsRoom_MapScriptHeader: changeblock $4, $e, $2a reloadmappart closetext - dotrigger $1 + setscene $1 setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -138,12 +138,12 @@ WillsRoom_MapEventHeader: warp_def $2, $4, 1, KOGAS_ROOM warp_def $2, $5, 2, KOGAS_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_WILL, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, WillScript_Battle, -1 + object_event SPRITE_WILL, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WillScript_Battle, -1 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index a14a3d3fb..593638297 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -7,19 +7,19 @@ const_value set 2 const WISETRIOSROOM_SAGE6 WiseTriosRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 dbw MAPCALLBACK_OBJECTS, .WiseTrioCallback -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end .WiseTrioCallback: @@ -105,7 +105,7 @@ TrainerSageKoji: applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628 spriteface WISETRIOSROOM_SAGE6, UP setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER - dotrigger $1 + setscene $1 end UnknownScript_0x9861b: @@ -354,18 +354,18 @@ WiseTriosRoom_MapEventHeader: warp_def $5, $7, 5, ECRUTEAK_CITY warp_def $4, $1, 5, ECRUTEAK_HOUSE -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $4, $7, UnknownScript_0x985a3 + coord_event 0, $4, $7, UnknownScript_0x985a3 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_SAGE, 2, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 - person_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 - person_event SPRITE_SAGE, 5, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 - person_event SPRITE_SAGE, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 - person_event SPRITE_SAGE, 6, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 - person_event SPRITE_SAGE, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + object_event SPRITE_SAGE, 2, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + object_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + object_event SPRITE_SAGE, 5, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + object_event SPRITE_SAGE, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + object_event SPRITE_SAGE, 6, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + object_event SPRITE_SAGE, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 diff --git a/mobile/battle_tower_5c.asm b/mobile/battle_tower_5c.asm index b5ef96fdd..da1691038 100755 --- a/mobile/battle_tower_5c.asm +++ b/mobile/battle_tower_5c.asm @@ -1519,15 +1519,15 @@ Jumptable_1709e7: ; 1709e7 ld b, a ld a, [MapNumber] ld c, a - call GetMapTrigger + call GetMapSceneID ld a, d or e - jr z, .no_trigger + jr z, .no_scene ld a, [de] and a ret nz -.no_trigger +.no_scene ld a, $1 ld [ScriptVar], a ret @@ -1544,14 +1544,14 @@ Jumptable_1709e7: ; 1709e7 ld b, a ld a, [MapNumber] ld c, a - call GetMapTrigger + call GetMapSceneID ld a, d or e - jr z, .no_trigger_2 + jr z, .no_scene_2 xor a ld [de], a -.no_trigger_2 +.no_scene_2 ret ; 170a9c diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index b804bb473..1c2adbfce 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -432,7 +432,7 @@ Function1143b7: ; 1143b7 pop hl push af ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -682,7 +682,7 @@ Function1144d1: ; 1144d1 .asm_11451c pop hl ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -699,7 +699,7 @@ Function1144d1: ; 1144d1 .asm_114537 ld hl, $dc06 ld a, [hl] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld hl, $dc09 @@ -710,7 +710,7 @@ Function1144d1: ; 1144d1 ld a, d or e jr z, .asm_114559 - ld hl, wCurrMapTriggerCount + ld hl, wCurrMapSceneScriptCount ld e, [hl] inc hl ld d, [hl] @@ -1275,7 +1275,7 @@ Function114843: ; 114843 Function114867: ; 114867 ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -1303,7 +1303,7 @@ Function114867: ; 114867 inc e call z, Function1148b9 ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld [hl], e inc hl @@ -1334,7 +1334,7 @@ Function114867: ; 114867 Function1148b9: ; 1148b9 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -1344,7 +1344,7 @@ Function1148b9: ; 1148b9 Function1148c2: ; 1148c2 ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -1397,7 +1397,7 @@ Function1148c2: ; 1148c2 inc e call z, Function114944 ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld [hl], e inc hl @@ -1436,7 +1436,7 @@ Function1148c2: ; 1148c2 Function114944: ; 114944 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -1446,7 +1446,7 @@ Function114944: ; 114944 Function11494d: ; 11494d ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -1491,7 +1491,7 @@ Function11494d: ; 11494d inc e call z, Function1149c3 ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld [hl], e inc hl @@ -1530,7 +1530,7 @@ Function11494d: ; 11494d Function1149c3: ; 1149c3 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -1540,7 +1540,7 @@ Function1149c3: ; 1149c3 Function1149cc: ; 1149cc ld hl, $dc06 ld a, [hl] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a push de @@ -1559,7 +1559,7 @@ Function1149cc: ; 1149cc ld [hl], d dec hl ld [hl], e - ld hl, wCurrMapTriggerCount + ld hl, wCurrMapSceneScriptCount ld e, [hl] inc hl ld d, [hl] @@ -1572,7 +1572,7 @@ Function1149cc: ; 1149cc inc e call z, Function114a0f ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld [hl], e inc hl @@ -1590,7 +1590,7 @@ Function1149cc: ; 1149cc Function114a0f: ; 114a0f push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -1903,7 +1903,7 @@ endr .asm_114b96 ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -1954,7 +1954,7 @@ Function114bbc: ; 114bbc jr z, .asm_114bff pop hl ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -2187,7 +2187,7 @@ endr .asm_114d11 pop hl ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -2497,7 +2497,7 @@ Function114e62: ; 114e62 Function114ea0: ; 114ea0 ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -2522,7 +2522,7 @@ Function114ea0: ; 114ea0 inc e call z, Function114ee0 ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -2544,7 +2544,7 @@ Function114ea0: ; 114ea0 Function114ee0: ; 114ee0 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -2787,7 +2787,7 @@ Function115020: ; 115020 push hl ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -2814,7 +2814,7 @@ Function115020: ; 115020 .asm_115046 ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -2834,7 +2834,7 @@ Function115020: ; 115020 Function115059: ; 115059 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -3003,7 +3003,7 @@ Function1150b3: ; 1150b3 Function115136: ; 115136 ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -3030,7 +3030,7 @@ Function115136: ; 115136 .asm_11515d ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -3050,7 +3050,7 @@ Function115136: ; 115136 Function115170: ; 115170 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -3060,7 +3060,7 @@ Function115170: ; 115170 Function115179: ; 115179 ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -3155,7 +3155,7 @@ Function115179: ; 115179 inc e call z, Function11520e ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -3171,7 +3171,7 @@ Function115179: ; 115179 Function11520e: ; 11520e push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -3182,7 +3182,7 @@ Function115217: ; 115217 push hl ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -3221,7 +3221,7 @@ Function115217: ; 115217 .asm_115252 ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -3267,7 +3267,7 @@ Function115217: ; 115217 Function115286: ; 115286 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -3672,7 +3672,7 @@ Function1153d2: ; 1153d2 ld [de], a ld hl, RightOrnament ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -3681,7 +3681,7 @@ Function1153d2: ; 1153d2 ld hl, $ddc8 call Function115d6a ld hl, RightOrnament - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld [hl], e inc hl @@ -3911,7 +3911,7 @@ Function1155d1: ; 1155d1 Function11560a: ; 11560a ld a, [$dc06] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld a, [$dc17] ld [$dc00], a ld [hFF8C], a @@ -3986,16 +3986,16 @@ Function11560a: ; 11560a inc hl ld [hl], d pop bc - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hFF8C], a ld [MBC3SRamBank], a - ld hl, wCurrMapTriggerCount + ld hl, wCurrMapSceneScriptCount ld e, [hl] inc hl ld d, [hl] ld hl, $dc24 call Function115d6a - ld hl, wCurrMapTriggerCount + ld hl, wCurrMapSceneScriptCount ld [hl], e inc hl ld [hl], d @@ -4008,7 +4008,7 @@ Function11560a: ; 11560a jr nz, .asm_11564d .asm_1156a9 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [$dc06], a xor a ret @@ -4354,9 +4354,9 @@ Function11581e: ; 11581e ld [wCurrMapCallbackHeaderPointer], a pop bc pop hl - ld hl, wCurrMapTriggerCount + ld hl, wCurrMapSceneScriptCount ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -4364,8 +4364,8 @@ Function11581e: ; 11581e ld d, [hl] ld hl, PartyMon5Speed call Function115d6a - ld hl, wCurrMapTriggerCount - ld a, [wCurrentMapSignpostCount] + ld hl, wCurrMapSceneScriptCount + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -4921,9 +4921,9 @@ Function115b00: ; 115b00 ld [wCurrMapCallbackHeaderPointer], a pop bc pop hl - ld hl, wCurrMapTriggerCount + ld hl, wCurrMapSceneScriptCount ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -4931,8 +4931,8 @@ Function115b00: ; 115b00 ld d, [hl] ld hl, $dc26 call Function115d6a - ld hl, wCurrMapTriggerCount - ld a, [wCurrentMapSignpostCount] + ld hl, wCurrMapSceneScriptCount + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -5312,7 +5312,7 @@ Function115d6a: ; 115d6a Function115d77: ; 115d77 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 6e0aed218..150f9baa7 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -7632,7 +7632,7 @@ Function11b7e5: ; 11b7e5 ld b, a ld a, [MapNumber] ld c, a - call GetMapTrigger + call GetMapSceneID ld a, d or e jr z, .asm_11b872 diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index cf779e56a..ea485089c 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -314,7 +314,7 @@ Function17d0f3: ; 17d0f3 ld b, a ld a, [MapNumber] ld c, a - call GetMapTrigger + call GetMapSceneID ld a, d or e jr z, .asm_17d180 diff --git a/wram.asm b/wram.asm index a586413b1..382f6e2e8 100644 --- a/wram.asm +++ b/wram.asm @@ -168,7 +168,7 @@ wPlayerNextMovement:: db wPlayerMovement:: db ds 2 wc2e2:: -wMovementPerson:: +wMovementObject:: db wMovementDataPointer:: ds 3 ; dba wc2e6:: ds 4 @@ -1596,7 +1596,7 @@ LuckyNumberDigit5Buffer:: db NEXTU ; d002 ; movement buffer data wMovementBufferCount:: db -wMovementBufferPerson:: db +wMovementBufferObject:: db wUnusedMovementBufferBank:: db wUnusedMovementBufferPointer:: dw MovementBuffer:: ds 55 @@ -1698,18 +1698,18 @@ wElevatorOriginFloor:: db NEXTU ; d03e ; coord event data -wCurCoordEventTriggerID:: db +wCurCoordEventSceneID:: db wCurCoordEventMapY:: db wCurCoordEventMapX:: db ds 1 wCurCoordEventScriptAddr:: dw NEXTU ; d03e -; signpost data -wCurSignpostYCoord:: db -wCurSignpostXCoord:: db -wCurSignpostType:: db -wCurSignpostScriptAddr:: dw +; BG event data +wCurBGEventYCoord:: db +wCurBGEventXCoord:: db +wCurBGEventType:: db +wCurBGEventScriptAddr:: dw NEXTU ; d03e ; mart data @@ -2192,7 +2192,7 @@ ScriptFlags2:: ; d435 db ScriptFlags3:: ; d436 ; bit 0: count steps -; bit 1: xy triggers +; bit 1: coord events ; bit 2: warps and connections ; bit 4: wild encounters ; bit 5: unknown @@ -2426,86 +2426,86 @@ FarfetchdPosition:: db ; d964 ds 13 -; map triggers -wPokecenter2FTrigger:: db ; d972 -wTradeCenterTrigger:: db ; d973 -wColosseumTrigger:: db ; d974 -wTimeCapsuleTrigger:: db ; d975 -wPowerPlantTrigger:: db ; d976 -wCeruleanGymTrigger:: db ; d977 -wRoute25Trigger:: db ; d978 -wTrainerHouseB1FTrigger:: db ; d979 -wVictoryRoadGateTrigger:: db ; d97a -wSaffronTrainStationTrigger:: db ; d97b -wRoute16GateTrigger:: db ; d97c -wRoute1718GateTrigger:: db ; d97d -wIndigoPlateauPokecenter1FTrigger:: db ; d97e -wWillsRoomTrigger:: db ; d97f -wKogasRoomTrigger:: db ; d980 -wBrunosRoomTrigger:: db ; d981 -wKarensRoomTrigger:: db ; d982 -wLancesRoomTrigger:: db ; d983 -wHallOfFameTrigger:: db ; d984 -wRoute27Trigger:: db ; d985 -wNewBarkTownTrigger:: db ; d986 -wElmsLabTrigger:: db ; d987 -wKrissHouse1FTrigger:: db ; d988 -wRoute29Trigger:: db ; d989 -wCherrygroveCityTrigger:: db ; d98a -wMrPokemonsHouseTrigger:: db ; d98b -wRoute32Trigger:: db ; d98c -wRoute35NationalParkGateTrigger:: db ; d98d -wRoute36Trigger:: db ; d98e -wRoute36NationalParkGateTrigger:: db ; d98f -wAzaleaTownTrigger:: db ; d990 -wGoldenrodGymTrigger:: db ; d991 -wGoldenrodMagnetTrainStationTrigger:: db ; d992 -wGoldenrodPokecenter1FTrigger:: db ; d993 -wOlivineCityTrigger:: db ; d994 -wRoute34Trigger:: db ; d995 -wRoute34IlexForestGateTrigger:: db ; d996 -wEcruteakHouseTrigger:: db ; d997 -wWiseTriosRoomTrigger:: db ; d998 -wEcruteakPokecenter1FTrigger:: db ; d999 -wEcruteakGymTrigger:: db ; d99a -wMahoganyTownTrigger:: db ; d99b -wRoute42Trigger:: db ; d99c -wCianwoodCityTrigger:: db ; d99d -wBattleTower1FTrigger:: db ; d99e -wBattleTowerBattleRoomTrigger:: db ; d99f -wBattleTowerElevatorTrigger:: db ; d9a0 -wBattleTowerHallwayTrigger:: db ; d9a1 -wBattleTowerOutsideTrigger:: db ; d9a2 -wRoute43GateTrigger:: db ; d9a3 -wMountMoonTrigger:: db ; d9a4 -wSproutTower3FTrigger:: db ; d9a5 -wTinTower1FTrigger:: db ; d9a6 -wBurnedTower1FTrigger:: db ; d9a7 -wBurnedTowerB1FTrigger:: db ; d9a8 -wRadioTower5FTrigger:: db ; d9a9 -wRuinsOfAlphOutsideTrigger:: db ; d9aa -wRuinsOfAlphResearchCenterTrigger:: db ; d9ab -wRuinsOfAlphHoOhChamberTrigger:: db ; d9ac -wRuinsOfAlphKabutoChamberTrigger:: db ; d9ad -wRuinsOfAlphOmanyteChamberTrigger:: db ; d9ae -wRuinsOfAlphAerodactylChamberTrigger:: db ; d9af -wRuinsOfAlphInnerChamberTrigger:: db ; d9b0 -wMahoganyMart1FTrigger:: db ; d9b1 -wTeamRocketBaseB1FTrigger:: db ; d9b2 -wTeamRocketBaseB2FTrigger:: db ; d9b3 -wTeamRocketBaseB3FTrigger:: db ; d9b4 -wUndergroundPathSwitchRoomEntrancesTrigger:: db ; d9b5 -wSilverCaveRoom3Trigger:: db ; d9b6 -wVictoryRoadTrigger:: db ; d9b7 -wDragonsDenB1FTrigger:: db ; d9b8 -wDragonShrineTrigger:: db ; d9b9 -wOlivinePortTrigger:: db ; d9ba -wVermilionPortTrigger:: db ; d9bb -wFastShip1FTrigger:: db ; d9bc -wFastShipB1FTrigger:: db ; d9bd -wMountMoonSquareTrigger:: db ; d9be -wMobileTradeRoomMobileTrigger:: db ; d9bf -wMobileBattleRoomTrigger:: db ; d9c0 +; map scene ids +wPokecenter2FSceneID:: db ; d972 +wTradeCenterSceneID:: db ; d973 +wColosseumSceneID:: db ; d974 +wTimeCapsuleSceneID:: db ; d975 +wPowerPlantSceneID:: db ; d976 +wCeruleanGymSceneID:: db ; d977 +wRoute25SceneID:: db ; d978 +wTrainerHouseB1FSceneID:: db ; d979 +wVictoryRoadGateSceneID:: db ; d97a +wSaffronTrainStationSceneID:: db ; d97b +wRoute16GateSceneID:: db ; d97c +wRoute1718GateSceneID:: db ; d97d +wIndigoPlateauPokecenter1FSceneID:: db ; d97e +wWillsRoomSceneID:: db ; d97f +wKogasRoomSceneID:: db ; d980 +wBrunosRoomSceneID:: db ; d981 +wKarensRoomSceneID:: db ; d982 +wLancesRoomSceneID:: db ; d983 +wHallOfFameSceneID:: db ; d984 +wRoute27SceneID:: db ; d985 +wNewBarkTownSceneID:: db ; d986 +wElmsLabSceneID:: db ; d987 +wKrissHouse1FSceneID:: db ; d988 +wRoute29SceneID:: db ; d989 +wCherrygroveCitySceneID:: db ; d98a +wMrPokemonsHouseSceneID:: db ; d98b +wRoute32SceneID:: db ; d98c +wRoute35NationalParkGateSceneID:: db ; d98d +wRoute36SceneID:: db ; d98e +wRoute36NationalParkGateSceneID:: db ; d98f +wAzaleaTownSceneID:: db ; d990 +wGoldenrodGymSceneID:: db ; d991 +wGoldenrodMagnetTrainStationSceneID:: db ; d992 +wGoldenrodPokecenter1FSceneID:: db ; d993 +wOlivineCitySceneID:: db ; d994 +wRoute34SceneID:: db ; d995 +wRoute34IlexForestGateSceneID:: db ; d996 +wEcruteakHouseSceneID:: db ; d997 +wWiseTriosRoomSceneID:: db ; d998 +wEcruteakPokecenter1FSceneID:: db ; d999 +wEcruteakGymSceneID:: db ; d99a +wMahoganyTownSceneID:: db ; d99b +wRoute42SceneID:: db ; d99c +wCianwoodCitySceneID:: db ; d99d +wBattleTower1FSceneID:: db ; d99e +wBattleTowerBattleRoomSceneID:: db ; d99f +wBattleTowerElevatorSceneID:: db ; d9a0 +wBattleTowerHallwaySceneID:: db ; d9a1 +wBattleTowerOutsideSceneID:: db ; d9a2 +wRoute43GateSceneID:: db ; d9a3 +wMountMoonSceneID:: db ; d9a4 +wSproutTower3FSceneID:: db ; d9a5 +wTinTower1FSceneID:: db ; d9a6 +wBurnedTower1FSceneID:: db ; d9a7 +wBurnedTowerB1FSceneID:: db ; d9a8 +wRadioTower5FSceneID:: db ; d9a9 +wRuinsOfAlphOutsideSceneID:: db ; d9aa +wRuinsOfAlphResearchCenterSceneID:: db ; d9ab +wRuinsOfAlphHoOhChamberSceneID:: db ; d9ac +wRuinsOfAlphKabutoChamberSceneID:: db ; d9ad +wRuinsOfAlphOmanyteChamberSceneID:: db ; d9ae +wRuinsOfAlphAerodactylChamberSceneID:: db ; d9af +wRuinsOfAlphInnerChamberSceneID:: db ; d9b0 +wMahoganyMart1FSceneID:: db ; d9b1 +wTeamRocketBaseB1FSceneID:: db ; d9b2 +wTeamRocketBaseB2FSceneID:: db ; d9b3 +wTeamRocketBaseB3FSceneID:: db ; d9b4 +wUndergroundPathSwitchRoomEntrancesSceneID:: db ; d9b5 +wSilverCaveRoom3SceneID:: db ; d9b6 +wVictoryRoadSceneID:: db ; d9b7 +wDragonsDenB1FSceneID:: db ; d9b8 +wDragonShrineSceneID:: db ; d9b9 +wOlivinePortSceneID:: db ; d9ba +wVermilionPortSceneID:: db ; d9bb +wFastShip1FSceneID:: db ; d9bc +wFastShipB1FSceneID:: db ; d9bd +wMountMoonSquareSceneID:: db ; d9be +wMobileTradeRoomMobileSceneID:: db ; d9bf +wMobileBattleRoomSceneID:: db ; d9c0 ds 49 @@ -2566,19 +2566,19 @@ BikeFlags:: ; dbf5 ds 1 -wCurrentMapTriggerPointer:: dw ; dbf7 +wCurrMapSceneScriptPointer:: dw ; dbf7 wCurrentCaller:: dw ; dbf9 wCurrMapWarpCount:: db ; dbfb wCurrMapWarpHeaderPointer:: dw ; dbfc -wCurrentMapXYTriggerCount:: db ; dbfe -wCurrentMapXYTriggerHeaderPointer:: dw ; dbff -wCurrentMapSignpostCount:: db ; dc01 -wCurrentMapSignpostHeaderPointer:: dw ; dc02 -wCurrentMapPersonEventCount:: db ; dc04 -wCurrentMapPersonEventHeaderPointer:: dw ; dc05 -wCurrMapTriggerCount:: db ; dc07 -wCurrMapTriggerHeaderPointer:: dw ; dc08 +wCurrMapCoordEventCount:: db ; dbfe +wCurrMapCoordEventHeaderPointer:: dw ; dbff +wCurrMapBGEventCount:: db ; dc01 +wCurrMapBGEventHeaderPointer:: dw ; dc02 +wCurrMapObjectEventCount:: db ; dc04 +wCurrMapObjectEventHeaderPointer:: dw ; dc05 +wCurrMapSceneScriptCount:: db ; dc07 +wCurrMapSceneScriptHeaderPointer:: dw ; dc08 wCurrMapCallbackCount:: db ; dc0a wCurrMapCallbackHeaderPointer:: dw ; dc0b From 9973e43d5aaffeef9d68994a665d2b0231f56f41 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 24 Dec 2017 15:03:20 -0500 Subject: [PATCH 5/7] =?UTF-8?q?Fix=20issue=20#345:=20-=20GetMonFrontpic=20?= =?UTF-8?q?=E2=86=92=20GetEnemyMonFrontpic=20-=20GetMonBackpic=20=E2=86=92?= =?UTF-8?q?=20GetBattleMonBackpic=20-=20FrontpicPredef=20=E2=86=92=20GetAn?= =?UTF-8?q?imatedFrontpicPredef=20-=20GetFrontpic=20=E2=86=92=20GetMonFron?= =?UTF-8?q?tpic=20-=20GetBackpic=20=E2=86=92=20GetMonBackpic=20-=20CutAndP?= =?UTF-8?q?asteMap=20=E2=86=92=20PadMapForHDMATransfer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- battle/anim_commands.asm | 8 ++++---- battle/core.asm | 34 +++++++++++++++---------------- battle/effect_commands.asm | 4 ++-- engine/billspc.asm | 2 +- engine/breeding.asm | 4 ++-- engine/debug.asm | 2 +- engine/dma_transfer.asm | 37 +++++++++++++++++----------------- engine/evolution_animation.asm | 2 +- engine/pokedex.asm | 6 +++--- engine/pokepic.asm | 2 +- engine/predef.asm | 10 ++++----- engine/stats_screen.asm | 4 ++-- engine/trade_animation.asm | 2 +- engine/trademon_frontpic.asm | 2 +- event/halloffame.asm | 2 +- event/print_unown.asm | 2 +- gfx/load_pics.asm | 6 +++--- gfx/pics/animation.asm | 2 +- home.asm | 2 +- main.asm | 4 ++-- mobile/mobile_42.asm | 4 ++-- 21 files changed, 71 insertions(+), 70 deletions(-) diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index 561d509d7..510f44d2b 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -932,7 +932,7 @@ BattleAnimCmd_Transform: ; cc5dc (33:45dc) ld hl, BattleMonDVs ; BattleMonDVs predef GetUnownLetter ld de, VTiles0 tile $00 - predef GetFrontpic + predef GetMonFrontpic jr .done .player @@ -941,7 +941,7 @@ BattleAnimCmd_Transform: ; cc5dc (33:45dc) ld hl, EnemyMonDVs ; EnemyMonDVs predef GetUnownLetter ld de, VTiles0 tile $00 - predef GetBackpic + predef GetMonBackpic .done pop af @@ -1159,14 +1159,14 @@ BattleAnimCmd_BeatUp: ; cc776 (33:4776) ld hl, BattleMonDVs predef GetUnownLetter ld de, VTiles2 tile $00 - predef GetFrontpic + predef GetMonFrontpic jr .done .player ld hl, EnemyMonDVs predef GetUnownLetter ld de, VTiles2 tile $31 - predef GetBackpic + predef GetMonBackpic .done pop af diff --git a/battle/core.asm b/battle/core.asm index 593caf649..7a12538dc 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -3689,7 +3689,7 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7 ld a, OTPARTYMON ld [MonType], a predef CopyPkmnToTempMon - call GetMonFrontpic + call GetEnemyMonFrontpic xor a ld [wNumHits], a @@ -4176,7 +4176,7 @@ SendOutPlayerMon: ; 3db5f call WaitBGMap xor a ld [hBGMapMode], a - call GetMonBackpic + call GetBattleMonBackpic xor a ld [hGraphicStartTile], a ld [wBattleMenuCursorBuffer], a @@ -5185,8 +5185,8 @@ BattleMenu_Pack: ; 3e1c7 call ClearPalettes call DelayFrame call _LoadBattleFontsHPBar - call GetMonBackpic - call GetMonFrontpic + call GetBattleMonBackpic + call GetEnemyMonFrontpic call ExitMenu call WaitBGMap call FinishBattleAnim @@ -5218,10 +5218,10 @@ BattleMenu_Pack: ; 3e1c7 ld a, [BattleType] cp BATTLETYPE_TUTORIAL jr z, .tutorial2 - call GetMonBackpic + call GetBattleMonBackpic .tutorial2 - call GetMonFrontpic + call GetEnemyMonFrontpic ld a, $1 ld [wMenuCursorY], a call ExitMenu @@ -8269,17 +8269,17 @@ PlaceExpBar: ; 3f41c ret ; 3f43d -GetMonBackpic: ; 3f43d +GetBattleMonBackpic: ; 3f43d ld a, [PlayerSubStatus4] bit SUBSTATUS_SUBSTITUTE, a ld hl, BattleAnimCmd_RaiseSub - jr nz, GetBackpic_DoAnim ; substitute + jr nz, GetBattleMonBackpic_DoAnim ; substitute DropPlayerSub: ; 3f447 ld a, [wPlayerMinimized] and a ld hl, BattleAnimCmd_MinimizeOpp - jr nz, GetBackpic_DoAnim + jr nz, GetBattleMonBackpic_DoAnim ld a, [CurPartySpecies] push af ld a, [BattleMonSpecies] @@ -8287,13 +8287,13 @@ DropPlayerSub: ; 3f447 ld hl, BattleMonDVs predef GetUnownLetter ld de, VTiles2 tile $31 - predef GetBackpic + predef GetMonBackpic pop af ld [CurPartySpecies], a ret ; 3f46f -GetBackpic_DoAnim: ; 3f46f +GetBattleMonBackpic_DoAnim: ; 3f46f ld a, [hBattleTurn] push af xor a @@ -8305,17 +8305,17 @@ GetBackpic_DoAnim: ; 3f46f ret ; 3f47c -GetMonFrontpic: ; 3f47c +GetEnemyMonFrontpic: ; 3f47c ld a, [EnemySubStatus4] bit SUBSTATUS_SUBSTITUTE, a ld hl, BattleAnimCmd_RaiseSub - jr nz, GetFrontpic_DoAnim + jr nz, GetEnemyMonFrontpic_DoAnim DropEnemySub: ; 3f486 ld a, [wEnemyMinimized] and a ld hl, BattleAnimCmd_MinimizeOpp - jr nz, GetFrontpic_DoAnim + jr nz, GetEnemyMonFrontpic_DoAnim ld a, [CurPartySpecies] push af @@ -8326,13 +8326,13 @@ DropEnemySub: ; 3f486 ld hl, EnemyMonDVs predef GetUnownLetter ld de, VTiles2 - predef FrontpicPredef + predef GetAnimatedFrontpicPredef pop af ld [CurPartySpecies], a ret ; 3f4b4 -GetFrontpic_DoAnim: ; 3f4b4 +GetEnemyMonFrontpic_DoAnim: ; 3f4b4 ld a, [hBattleTurn] push af call SetEnemyTurn @@ -8532,7 +8532,7 @@ InitEnemyWildmon: ; 3f607 ld [wFirstUnownSeen], a .skip_unown ld de, VTiles2 - predef FrontpicPredef + predef GetAnimatedFrontpicPredef xor a ld [TrainerClass], a ld [hGraphicStartTile], a diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index d04da6b52..8f148c883 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -6299,11 +6299,11 @@ BattleCommand_Curl: ; 365a7 BattleCommand_RaiseSubNoAnim: ; 365af - ld hl, GetMonBackpic + ld hl, GetBattleMonBackpic ld a, [hBattleTurn] and a jr z, .PlayerTurn - ld hl, GetMonFrontpic + ld hl, GetEnemyMonFrontpic .PlayerTurn: xor a ld [hBGMapMode], a diff --git a/engine/billspc.asm b/engine/billspc.asm index 0bdacf436..2dd9a512f 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -1108,7 +1108,7 @@ PCMonInfo: ; e2ac6 (38:6ac6) predef GetUnownLetter call GetBaseData ld de, VTiles2 tile $00 - predef GetFrontpic + predef GetMonFrontpic xor a ld [wBillsPC_MonHasMail], a ld a, [CurPartySpecies] diff --git a/engine/breeding.asm b/engine/breeding.asm index 517908902..967694612 100755 --- a/engine/breeding.asm +++ b/engine/breeding.asm @@ -649,7 +649,7 @@ GetEggFrontpic: ; 17224 (5:7224) ld hl, BattleMonDVs predef GetUnownLetter pop de - predef_jump GetFrontpic + predef_jump GetMonFrontpic GetHatchlingFrontpic: ; 1723c (5:723c) push de @@ -659,7 +659,7 @@ GetHatchlingFrontpic: ; 1723c (5:723c) ld hl, BattleMonDVs predef GetUnownLetter pop de - predef_jump FrontpicPredef + predef_jump GetAnimatedFrontpicPredef Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254) push af diff --git a/engine/debug.asm b/engine/debug.asm index 65f2cfb36..588de7a64 100755 --- a/engine/debug.asm +++ b/engine/debug.asm @@ -315,7 +315,7 @@ Function81adb: ; 81adb hlcoord 12, 3 call _PrepMonFrontpic ld de, VTiles2 tile $31 - predef GetBackpic + predef GetMonBackpic ld a, $31 ld [hGraphicStartTile], a hlcoord 2, 4 diff --git a/engine/dma_transfer.asm b/engine/dma_transfer.asm index a0dad0dde..9d95c87b1 100755 --- a/engine/dma_transfer.asm +++ b/engine/dma_transfer.asm @@ -5,10 +5,10 @@ HDMATransferAttrMapAndTileMapToWRAMBank3:: ; 104000 .Function: decoord 0, 0, AttrMap ld hl, wScratchAttrMap - call CutAndPasteAttrMap + call PadAttrMapForHDMATransfer decoord 0, 0 ld hl, wScratchTileMap - call CutAndPasteTilemap + call PadTilemapForHDMATransfer ld a, $0 ld [rVBK], a ld hl, wScratchTileMap @@ -27,7 +27,7 @@ HDMATransferTileMapToWRAMBank3:: ; 10402d .Function: decoord 0, 0 ld hl, wScratchTileMap - call CutAndPasteTilemap + call PadTilemapForHDMATransfer ld a, $0 ld [rVBK], a ld hl, wScratchTileMap @@ -42,7 +42,7 @@ HDMATransferAttrMapToWRAMBank3: ; 104047 .Function: decoord 0, 0, AttrMap ld hl, wScratchAttrMap - call CutAndPasteAttrMap + call PadAttrMapForHDMATransfer ld a, $1 ld [rVBK], a ld hl, wScratchAttrMap @@ -57,10 +57,10 @@ ReloadMapPart:: ; 104061 .Function: decoord 0, 0, AttrMap ld hl, wScratchAttrMap - call CutAndPasteAttrMap + call PadAttrMapForHDMATransfer decoord 0, 0 ld hl, wScratchTileMap - call CutAndPasteTilemap + call PadTilemapForHDMATransfer call DelayFrame di @@ -88,10 +88,10 @@ Mobile_ReloadMapPart: ; 104099 .Function: decoord 0, 0, AttrMap ld hl, wScratchAttrMap - call CutAndPasteAttrMap + call PadAttrMapForHDMATransfer decoord 0, 0 ld hl, wScratchTileMap - call CutAndPasteTilemap + call PadTilemapForHDMATransfer call DelayFrame di @@ -161,10 +161,10 @@ OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:: ; 104110 ; Fill vBGTiles with " " decoord 0, 0, AttrMap ld hl, wScratchAttrMap - call CutAndPasteAttrMap + call PadAttrMapForHDMATransfer decoord 0, 0 ld hl, wScratchTileMap - call CutAndPasteTilemap + call PadTilemapForHDMATransfer call DelayFrame di @@ -194,11 +194,11 @@ Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap: ; 104148 (41:4148) ; Fill vBGTiles with $ff decoord 0, 0, AttrMap ld hl, wScratchAttrMap - call CutAndPasteAttrMap + call PadAttrMapForHDMATransfer ld c, $ff decoord 0, 0 ld hl, wScratchTileMap - call CutAndPasteMap + call PadMapForHDMATransfer ld a, $1 ld [rVBK], a @@ -422,15 +422,16 @@ _LoadHDMAParameters: ; 10424e (41:424e) ld [rHDMA4], a ret -CutAndPasteTilemap: ; 10425f (41:425f) +PadTilemapForHDMATransfer: ; 10425f (41:425f) ld c, " " - jr CutAndPasteMap + jr PadMapForHDMATransfer -CutAndPasteAttrMap: ; 104263 (41:4263) +PadAttrMapForHDMATransfer: ; 104263 (41:4263) ld c, $0 -CutAndPasteMap: ; 104265 (41:4265) -; back up the value of c to hMapObjectIndexBuffer +PadMapForHDMATransfer: ; 104265 (41:4265) +; pad a 20x18 map to 32x18 for HDMA transfer +; back up the padding value in c to hMapObjectIndexBuffer ld a, [hMapObjectIndexBuffer] push af ld a, c @@ -449,7 +450,7 @@ CutAndPasteMap: ; 104265 (41:4265) dec b jr nz, .loop2 -; load the original value of c into hl 12 times +; load the original padding value of c into hl for 32 - 20 = 12 rows ld a, [hMapObjectIndexBuffer] ld b, BG_MAP_WIDTH - SCREEN_WIDTH .loop3 diff --git a/engine/evolution_animation.asm b/engine/evolution_animation.asm index e2713fceb..dd09f9eda 100755 --- a/engine/evolution_animation.asm +++ b/engine/evolution_animation.asm @@ -168,7 +168,7 @@ EvolutionAnimation: ; 4e5e1 ld a, $1 ld [wBoxAlignment], a ld de, VTiles2 - predef FrontpicPredef + predef GetAnimatedFrontpicPredef xor a ld [wBoxAlignment], a ret diff --git a/engine/pokedex.asm b/engine/pokedex.asm index eef9c707a..12b5b2cd6 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -2403,7 +2403,7 @@ Pokedex_LoadSelectedMonTiles: ; 4143b ld [CurPartySpecies], a call GetBaseData ld de, VTiles2 - predef GetFrontpic + predef GetMonFrontpic ret .QuestionMark: @@ -2556,7 +2556,7 @@ Pokedex_LoadUnownFrontpicTiles: ; 41a58 (10:5a58) ld [CurPartySpecies], a call GetBaseData ld de, VTiles2 tile $00 - predef GetFrontpic + predef GetMonFrontpic pop af ld [UnownLetter], a ret @@ -2586,7 +2586,7 @@ _NewPokedexEntry: ; 41a7f call WaitBGMap call GetBaseData ld de, VTiles2 - predef GetFrontpic + predef GetMonFrontpic ld a, SCGB_POKEDEX call Pokedex_GetSGBLayout ld a, [CurPartySpecies] diff --git a/engine/pokepic.asm b/engine/pokepic.asm index 2530ae4c9..ea5b3c300 100755 --- a/engine/pokepic.asm +++ b/engine/pokepic.asm @@ -12,7 +12,7 @@ Pokepic:: ; 244e3 ld [CurSpecies], a call GetBaseData ld de, VTiles1 - predef GetFrontpic + predef GetMonFrontpic ld a, [wMenuBorderTopCoord] inc a ld b, a diff --git a/engine/predef.asm b/engine/predef.asm index 73bc937a3..837f7b96b 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -54,8 +54,8 @@ PredefPointers:: ; 856b add_predef UpdateEnemyHUD add_predef StartBattle add_predef FillInExpBar - add_predef GetMonBackpic ; $18 - add_predef GetMonFrontpic + add_predef GetBattleMonBackpic ; $18 + add_predef GetEnemyMonFrontpic add_predef LearnLevelMoves add_predef FillMoves add_predef EvolveAfterBattle @@ -90,9 +90,9 @@ PredefPointers:: ; 856b add_predef Predef39 add_predef Predef3A add_predef PartyMonItemName - add_predef GetFrontpic - add_predef GetBackpic - add_predef FrontpicPredef + add_predef GetMonFrontpic + add_predef GetMonBackpic + add_predef GetAnimatedFrontpicPredef add_predef GetTrainerPic add_predef DecompressPredef ; $40 add_predef CheckTypeMatchup diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index 842e5ea2c..5f35d4d8b 100755 --- a/engine/stats_screen.asm +++ b/engine/stats_screen.asm @@ -866,7 +866,7 @@ StatsScreen_PlaceFrontpic: ; 4e226 (13:6226) ret c call StatsScreen_LoadTextBoxSpaceGFX ld de, VTiles2 tile $00 - predef FrontpicPredef + predef GetAnimatedFrontpicPredef hlcoord 0, 0 ld d, $0 ld e, ANIM_MON_MENU @@ -1071,7 +1071,7 @@ StatsScreen_AnimateEgg: ; 4e497 (13:6497) ld [wBoxAlignment], a call StatsScreen_LoadTextBoxSpaceGFX ld de, VTiles2 tile $00 - predef FrontpicPredef + predef GetAnimatedFrontpicPredef pop de hlcoord 0, 0 ld d, $0 diff --git a/engine/trade_animation.asm b/engine/trade_animation.asm index 2fc8df854..711ba4d19 100755 --- a/engine/trade_animation.asm +++ b/engine/trade_animation.asm @@ -877,7 +877,7 @@ TradeAnim_GetFrontpic: ; 29491 ld [CurSpecies], a call GetBaseData pop de - predef GetFrontpic + predef GetMonFrontpic ret ; 294a9 diff --git a/engine/trademon_frontpic.asm b/engine/trademon_frontpic.asm index bf1c2965c..3a38688d7 100644 --- a/engine/trademon_frontpic.asm +++ b/engine/trademon_frontpic.asm @@ -10,7 +10,7 @@ GetTrademonFrontpic: ; 4d7fd ld [CurSpecies], a call GetBaseData pop de - predef FrontpicPredef + predef GetAnimatedFrontpicPredef ret AnimateTrademonFrontpic: ; 4d81e diff --git a/event/halloffame.asm b/event/halloffame.asm index 986c49096..3fadb233a 100755 --- a/event/halloffame.asm +++ b/event/halloffame.asm @@ -250,7 +250,7 @@ AnimateHOFMonEntrance: ; 865b5 ld a, " " call ByteFill ld de, VTiles2 tile $31 - predef GetBackpic + predef GetMonBackpic ld a, $31 ld [hGraphicStartTile], a hlcoord 6, 6 diff --git a/event/print_unown.asm b/event/print_unown.asm index 5d3966585..7841a688b 100644 --- a/event/print_unown.asm +++ b/event/print_unown.asm @@ -140,7 +140,7 @@ UnownPrinter: ; 16be4 xor a ld [wBoxAlignment], a ld de, VTiles2 - predef GetFrontpic + predef GetMonFrontpic call .Load2bppToSRAM hlcoord 1, 6 xor a diff --git a/gfx/load_pics.asm b/gfx/load_pics.asm index 040a1d644..838fc5656 100755 --- a/gfx/load_pics.asm +++ b/gfx/load_pics.asm @@ -48,7 +48,7 @@ GetUnownLetter: ; 51040 ld [UnownLetter], a ret -GetFrontpic: ; 51077 +GetMonFrontpic: ; 51077 ld a, [CurPartySpecies] ld [CurSpecies], a call IsAPokemon @@ -60,7 +60,7 @@ GetFrontpic: ; 51077 ld [rSVBK], a ret -FrontpicPredef: ; 5108b +GetAnimatedFrontpicPredef: ; 5108b ld a, [CurPartySpecies] ld [CurSpecies], a call IsAPokemon @@ -195,7 +195,7 @@ LoadFrontpicTiles: ; 5114f jr nz, .loop ret -GetBackpic: ; 5116c +GetMonBackpic: ; 5116c ld a, [CurPartySpecies] call IsAPokemon ret c diff --git a/gfx/pics/animation.asm b/gfx/pics/animation.asm index eeaaa49ad..2b93ef749 100644 --- a/gfx/pics/animation.asm +++ b/gfx/pics/animation.asm @@ -1121,7 +1121,7 @@ HOF_AnimateFrontpic: ; d066e Predef 49 push bc push hl ld de, VTiles2 - predef FrontpicPredef + predef GetAnimatedFrontpicPredef pop hl pop bc ld d, 0 diff --git a/home.asm b/home.asm index 18c1ce300..b5ac0db58 100644 --- a/home.asm +++ b/home.asm @@ -1075,7 +1075,7 @@ _PrepMonFrontpic:: ; 378b push hl ld de, VTiles2 - predef GetFrontpic + predef GetMonFrontpic pop hl xor a ld [hGraphicStartTile], a diff --git a/main.asm b/main.asm index dbb838066..cbeebac07 100644 --- a/main.asm +++ b/main.asm @@ -197,13 +197,13 @@ _ReturnToBattle_UseBall: ; 2715c ld a, [BattleType] cp BATTLETYPE_TUTORIAL jr z, .gettutorialbackpic - farcall GetMonBackpic + farcall GetBattleMonBackpic jr .continue .gettutorialbackpic farcall GetTrainerBackpic .continue - farcall GetMonFrontpic + farcall GetEnemyMonFrontpic farcall _LoadBattleFontsHPBar call GetMemSGBLayout call CloseWindow diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index 6b9db7741..e551b5245 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -296,7 +296,7 @@ MobileTradeAnim_GetFrontpic: ; 1081e9 ld [CurSpecies], a call GetBaseData pop de - predef GetFrontpic + predef GetMonFrontpic ret ; 108201 @@ -309,7 +309,7 @@ Function108201: ; 108201 ld [CurSpecies], a call GetBaseData pop de - predef FrontpicPredef + predef GetAnimatedFrontpicPredef ret ; 108219 From ef9090b9a07b3d727b1508957c76c899bbc39987 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 24 Dec 2017 15:09:28 -0500 Subject: [PATCH 6/7] Update documentation to match renaming --- docs/event_commands.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/event_commands.md b/docs/event_commands.md index 4bb8a1711..151d74b54 100644 --- a/docs/event_commands.md +++ b/docs/event_commands.md @@ -37,11 +37,11 @@ Defined in [macros/scripts/event.asm](/macros/scripts/event.asm) and [engine/scr ## `$10`: `ptcallasm` *asm* -## `$11`: `checkmaptriggers` *map* +## `$11`: `checkmapscene` *map* ## `$12`: `setmapscene` *map*, *scene_id* -## `$13`: `checktriggers` +## `$13`: `checkscene` ## `$14`: `setscene` *scene_id* @@ -215,37 +215,37 @@ Defined in [macros/scripts/event.asm](/macros/scripts/event.asm) and [engine/scr ## `$67`: `check_just_battled` -## `$68`: `setlasttalked` *person* +## `$68`: `setlasttalked` *object_id* -## `$69`: `applymovement` *person*, *data_pointer* +## `$69`: `applymovement` *object_id*, *data_pointer* ## `$6A`: `applymovement2` *data_pointer* ## `$6B`: `faceplayer` -## `$6C`: `faceperson` *person1*, *person2* +## `$6C`: `faceobject` *object1*, *object2* ## `$6D`: `variablesprite` *variable_sprite_id*, *sprite_id* -## `$6E`: `disappear` *person* +## `$6E`: `disappear` *object_id* -## `$6F`: `appear` *person* +## `$6F`: `appear` *object_id* -## `$70`: `follow` *person2*, *person1* +## `$70`: `follow` *object2*, *object1* ## `$71`: `stopfollow` -## `$72`: `moveperson` *person*, *x*, *y* +## `$72`: `moveobject` *object_id*, *x*, *y* -## `$73`: `writepersonxy` *person* +## `$73`: `writeobjectxy` *object_id* ## `$74`: `loademote` *emote_id* -## `$75`: `showemote` *emote_id*, *person*, *length* +## `$75`: `showemote` *emote_id*, *object_id*, *length* -## `$76`: `spriteface` *person*, *facing* +## `$76`: `spriteface` *object_id*, *facing* -## `$77`: `follownotexact` *person2*, *person1* +## `$77`: `follownotexact` *object2*, *object1* ## `$78`: `earthquake` *param* From 3e7f3bbeb6dd2d3cff6343dea2298502faa14185 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 24 Dec 2017 17:35:33 -0500 Subject: [PATCH 7/7] s/number/scene/, and correct some documentation --- docs/map_scripts.md | 4 ++-- macros/scripts/maps.asm | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/map_scripts.md b/docs/map_scripts.md index f601616ef..fa8fa308b 100644 --- a/docs/map_scripts.md +++ b/docs/map_scripts.md @@ -65,7 +65,7 @@ Callback types: ## `.CoordEvents: db` *N* -- **`coord_event` *id*, *y*, *x*, `$0`, *script*, `$0`, `$0`** +- **`coord_event` *scene id*, *y*, *x*, *script*** ## `.BGEvents: db` *N* @@ -90,7 +90,7 @@ BG event types: ## `.ObjectEvents: db` *N* -- **`object_event` *sprite*, *y*, *x*, *movement*, *ry*, *rx*, *hour*, *daytime*, *palette*, *type*, *range*, *script*, *event_flag*** +- **`object_event` *sprite*, *y*, *x*, *movement*, *ry*, *rx*, *h1*, *h2*, *palette*, *type*, *range*, *script*, *event_flag*** Movement types: diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 3f83740ca..8ef08ec49 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -19,7 +19,7 @@ warp_def: macro endm coord_event: macro -;\1: number: controlled by setscene/setmapscene +;\1: scene id: controlled by setscene/setmapscene ;\2: y: top to bottom, starts at 0 ;\3: x: left to right, starts at 0 ;\4: script pointer @@ -43,17 +43,17 @@ object_event: macro ;\3: x: left to right, starts at 0 ;\4: movement function: a SPRITEMOVEDATA_* constant ;\5, \6: movement radius: y, x -;\7, \8: hour1 and hour2: control the hours an object_event is visible (0-23) -; * if hour1 < hour2, the object_event will only appear from hour1 to hour2 -; * if hour1 > hour2, the object_event will not appear from hour2 to hour1 -; * if hour1 == hour2, the object_event will always appear -; * if hour1 == -1, hour2 is treated as a time-of-day value: +;\7, \8: hour limits: h1, h2 (0-23) +; * if h1 < h2, the object_event will only appear from h1 to h2 +; * if h1 > h2, the object_event will not appear from h2 to h1 +; * if h1 == h2, the object_event will always appear +; * if h1 == -1, h2 is treated as a time-of-day value: ; a combo of MORN, DAY, and/or NITE, or -1 to always appear ;\9: color: a PAL_NPC_* constant, or 0 for sprite default ;\10: function: a OBJECTTYPE_* constant ;\11: sight range: applies to OBJECTTYPE_TRAINER ;\12: script pointer -;\13: event flag: an EVENT_* constant, or 0 to always appear +;\13: event flag: an EVENT_* constant, or -1 to always appear db \1, \2 + 4, \3 + 4, \4 dn \5, \6 db \7, \8