diff options
Diffstat (limited to 'scripts/gary.asm')
| -rwxr-xr-x | scripts/gary.asm | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/scripts/gary.asm b/scripts/gary.asm index 290bd753..7babb73d 100755 --- a/scripts/gary.asm +++ b/scripts/gary.asm @@ -1,14 +1,14 @@ GaryScript: ; 75f1d (1d:5f1d) call EnableAutoTextBoxDrawing ld hl, GaryScriptPointers - ld a, [W_GARYCURSCRIPT] + ld a, [wGaryCurScript] call JumpTable ret -GaryScript_75f29: ; 75f29 (1d:5f29) +ResetGaryScript: ; 75f29 (1d:5f29) xor a ld [wJoyIgnore], a - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScriptPointers: ; 75f31 (1d:5f31) @@ -31,16 +31,16 @@ GaryScript1: ; 75f48 (1d:5f48) ld a, $ff ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd - ld de, RLEMovement75f63 + ld de, GaryEntrance_RLEMovement call DecodeRLEList dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $2 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret -RLEMovement75f63: ; 75f63 (1d:5f63) +GaryEntrance_RLEMovement: ; 75f63 (1d:5f63) db D_UP, 1 db D_RIGHT, 1 db D_UP, 3 @@ -54,7 +54,7 @@ GaryScript2: ; 75f6a (1d:5f6a) xor a ld [wJoyIgnore], a ld hl, wOptions - res 7, [hl] + res 7, [hl] ; Turn on battle animations to make the battle feel more epic. ld a, $1 ld [hSpriteIndexOrTextID], a call DisplayTextID @@ -62,27 +62,27 @@ GaryScript2: ; 75f6a (1d:5f6a) ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, GaryText_760f9 - ld de, GaryText_760fe + ld hl, GaryDefeatedText + ld de, GaryVictoryText call SaveEndBattleTextPointers ld a, OPP_SONY3 ld [wCurOpponent], a ; select which team to use during the encounter - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] add $0 ; Wow GameFreak ld [wTrainerNo], a xor a ld [hJoyHeld], a ld a, $3 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript3: ; 75fbb (1d:5fbb) ld a, [wIsInBattle] cp $ff - jp z, GaryScript_75f29 + jp z, ResetGaryScript call UpdateSprites SetEvent EVENT_BEAT_CHAMPION_RIVAL ld a, $f0 @@ -94,7 +94,7 @@ GaryScript3: ; 75fbb (1d:5fbb) ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld a, $4 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript4: ; 75fe4 (1d:5fe4) @@ -105,7 +105,7 @@ GaryScript4: ; 75fe4 (1d:5fe4) ld a, $2 ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF - ld de, MovementData_76014 + ld de, OakEntranceAfterVictoryMovement ld a, $2 ld [H_SPRITEINDEX], a call MoveSprite @@ -113,10 +113,10 @@ GaryScript4: ; 75fe4 (1d:5fe4) ld [wMissableObjectIndex], a predef ShowObject ld a, $5 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret -MovementData_76014: ; 76014 (1d:6014) +OakEntranceAfterVictoryMovement: ; 76014 (1d:6014) db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP @@ -144,7 +144,7 @@ GaryScript5: ; 7601a (1d:601a) ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $6 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript6: ; 76047 (1d:6047) @@ -157,7 +157,7 @@ GaryScript6: ; 76047 (1d:6047) ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $7 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript7: ; 7605f (1d:605f) @@ -169,15 +169,15 @@ GaryScript7: ; 7605f (1d:605f) ld a, $5 ld [hSpriteIndexOrTextID], a call GaryScript_760c8 - ld de, MovementData_76080 + ld de, OakExitGaryRoomMovement ld a, $2 ld [H_SPRITEINDEX], a call MoveSprite ld a, $8 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret -MovementData_76080: ; 76080 (1d:6080) +OakExitGaryRoomMovement: ; 76080 (1d:6080) db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db $FF @@ -190,23 +190,23 @@ GaryScript8: ; 76083 (1d:6083) ld [wMissableObjectIndex], a predef HideObject ld a, $9 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript9: ; 76099 (1d:6099) ld a, $ff ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd - ld de, RLEMovement760b4 + ld de, WalkToHallOfFame_RLEMovment call DecodeRLEList dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $a - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret -RLEMovement760b4: ; 760b4 (1d:60b4) +WalkToHallOfFame_RLEMovment: ; 760b4 (1d:60b4) db D_UP, 4 db D_LEFT, 1 db $ff @@ -218,7 +218,7 @@ GaryScript10: ; 760b9 (1d:60b9) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript_760c8: ; 760c8 (1d:60c8) @@ -239,23 +239,23 @@ GaryTextPointers: ; 760d6 (1d:60d6) GaryText1: ; 760e0 (1d:60e0) TX_ASM CheckEvent EVENT_BEAT_CHAMPION_RIVAL - ld hl, GaryText_760f4 - jr z, .asm_17e9f + ld hl, GaryChampionIntroText + jr z, .printText ld hl, GaryText_76103 -.asm_17e9f +.printText call PrintText jp TextScriptEnd -GaryText_760f4: ; 760f4 (1d:60f4) - TX_FAR _GaryText_760f4 +GaryChampionIntroText: ; 760f4 (1d:60f4) + TX_FAR _GaryChampionIntroText db "@" -GaryText_760f9: ; 760f9 (1d:60f9) - TX_FAR _GaryText_760f9 +GaryDefeatedText: ; 760f9 (1d:60f9) + TX_FAR _GaryDefeatedText db "@" -GaryText_760fe: ; 760fe (1d:60fe) - TX_FAR _GaryText_760fe +GaryVictoryText: ; 760fe (1d:60fe) + TX_FAR _GaryVictoryText db "@" GaryText_76103: ; 76103 (1d:6103) @@ -268,7 +268,7 @@ GaryText2: ; 76108 (1d:6108) GaryText3: ; 7610d (1d:610d) TX_ASM - ld a, [W_PLAYERSTARTER] + ld a, [wPlayerStarter] ld [wd11e], a call GetMonName ld hl, GaryText_76120 |