diff options
33 files changed, 445 insertions, 445 deletions
diff --git a/audio/cries.asm b/audio/cries.asm index 639b4a50..f7aef295 100644 --- a/audio/cries.asm +++ b/audio/cries.asm @@ -221,9 +221,9 @@ Cry_Magcargo_Ch6: Cry_Magcargo_Ch8: noise_note 2, 14, 8, 59 -Cry_Magcargo_branch_f2ef5: +Cry_Magcargo_branch_f2eb5: noise_note 1, 15, 1, 78 - sound_loop 5, Cry_Magcargo_branch_f2ef5 + sound_loop 5, Cry_Magcargo_branch_f2eb5 noise_note 2, 13, 8, 63 noise_note 20, 12, 2, 95 sound_ret @@ -348,7 +348,7 @@ Cry_Marill_Ch8: Cry_Togepi_Ch5: pitch_offset 2 Cry_Togepi_Ch6: -Cry_Togetic_branch_f3022: +Cry_Togetic_branch_f2fe2: duty_cycle_pattern 1, 1, 0, 2 square_note 4, 15, 1, 1942 square_note 4, 15, 1, 1837 @@ -359,7 +359,7 @@ Cry_Togetic_branch_f3022: Cry_Togetic_Ch5: pitch_offset 2 Cry_Togetic_Ch6: - sound_call Cry_Togetic_branch_f3022 + sound_call Cry_Togetic_branch_f2fe2 sound_loop 2, Cry_Togetic_Ch6 square_note 14, 0, 0, 0 square_note 8, 15, 2, 1986 @@ -436,12 +436,12 @@ Cry_Hoothoot_Ch5: Cry_Hoothoot_Ch6: duty_cycle_pattern 0, 2, 0, 2 -Cry_Hoothoot_branch_f30fb: +Cry_Hoothoot_branch_f30bb: square_note 2, 10, 1, 1536 - sound_loop 3, Cry_Hoothoot_branch_f30fb -Cry_Hoothoot_branch_f3103: + sound_loop 3, Cry_Hoothoot_branch_f30bb +Cry_Hoothoot_branch_f30c3: square_note 2, 10, 1, 1584 - sound_loop 4, Cry_Hoothoot_branch_f3103 + sound_loop 4, Cry_Hoothoot_branch_f30c3 square_note 4, 10, 2, 1588 square_note 4, 9, 1, 1592 sound_ret @@ -456,11 +456,11 @@ Cry_Hoothoot_Ch8: Cry_Sentret_Ch5: pitch_offset 32 duty_cycle 0 - sound_jump Cry_Sentret_branch_f312b + sound_jump Cry_Sentret_branch_f30eb Cry_Sentret_Ch6: duty_cycle_pattern 0, 1, 2, 3 -Cry_Sentret_branch_f312b: +Cry_Sentret_branch_f30eb: square_note 8, 3, -1, 1837 square_note 8, 15, 1, 1824 sound_ret @@ -473,12 +473,12 @@ Cry_Sentret_Ch8: Cry_Mareep_Ch5: pitch_offset 32 duty_cycle 0 - sound_jump Cry_Mareep_branch_f3145 + sound_jump Cry_Mareep_branch_f3105 Cry_Mareep_Ch6: duty_cycle_pattern 0, 0, 0, 1 -Cry_Mareep_branch_f3145: -Cry_Gligar_branch_f3145: +Cry_Mareep_branch_f3105: +Cry_Gligar_branch_f3105: square_note 4, 3, -2, 1853 square_note 6, 15, 8, 1890 square_note 6, 15, 8, 1888 @@ -490,14 +490,14 @@ Cry_Cyndaquil_Ch5: Cry_Cyndaquil_Ch6: duty_cycle 2 square_note 8, 2, -7, 263 -Cry_Cyndaquil_branch_f315f: +Cry_Cyndaquil_branch_f311f: square_note 0, 14, 1, 1155 square_note 0, 5, 1, 1102 - sound_loop 4, Cry_Cyndaquil_branch_f315f -Cry_Cyndaquil_branch_f316b: + sound_loop 4, Cry_Cyndaquil_branch_f311f +Cry_Cyndaquil_branch_f312b: square_note 0, 14, 1, 986 square_note 1, 5, 1, 786 - sound_loop 4, Cry_Cyndaquil_branch_f316b + sound_loop 4, Cry_Cyndaquil_branch_f312b sound_ret Cry_Gligar_Ch8: @@ -524,16 +524,16 @@ Cry_Chikorita_Ch8: Cry_Gligar_Ch5: duty_cycle_pattern 2, 2, 0, 2 - sound_jump Cry_Gligar_branch_f3145 + sound_jump Cry_Gligar_branch_f3105 Cry_Girafarig_Ch5: duty_cycle 1 pitch_offset 4 - sound_jump Cry_Girafarig_branch_f31af + sound_jump Cry_Girafarig_branch_f316f Cry_Girafarig_Ch6: duty_cycle_pattern 1, 0, 0, 1 -Cry_Girafarig_branch_f31af: +Cry_Girafarig_branch_f316f: square_note 4, 6, 8, 1880 square_note 2, 14, 8, 1888 square_note 2, 14, 8, 1895 @@ -568,11 +568,11 @@ Cry_Slugma_Ch8: Cry_Ledyba_Ch5: pitch_offset 2 duty_cycle 2 - sound_jump Cry_Ledyba_branch_f3202 + sound_jump Cry_Ledyba_branch_f31c2 Cry_Ledyba_Ch6: duty_cycle_pattern 0, 0, 0, 1 -Cry_Ledyba_branch_f3202: +Cry_Ledyba_branch_f31c2: square_note 3, 15, 8, 1937 square_note 3, 13, 8, 1933 square_note 2, 0, 0, 0 @@ -631,24 +631,24 @@ Cry_Donphan_Ch8: Cry_Teddiursa_Ch5: Cry_Typhlosion_Ch5: duty_cycle_pattern 0, 1, 0, 2 -Cry_Teddiursa_branch_f3286: +Cry_Teddiursa_branch_f3246: square_note 3, 12, 1, 1937 - sound_loop 3, Cry_Teddiursa_branch_f3286 -Cry_Teddiursa_branch_f328e: + sound_loop 3, Cry_Teddiursa_branch_f3246 +Cry_Teddiursa_branch_f324e: square_note 3, 13, 1, 1201 - sound_loop 6, Cry_Teddiursa_branch_f328e -Cry_Teddiursa_branch_f3296: + sound_loop 6, Cry_Teddiursa_branch_f324e +Cry_Teddiursa_branch_f3256: square_note 1, 13, 1, 1169 square_note 1, 11, 1, 1105 - sound_loop 6, Cry_Teddiursa_branch_f3296 -Cry_Teddiursa_branch_f32a2: + sound_loop 6, Cry_Teddiursa_branch_f3256 +Cry_Teddiursa_branch_f3262: square_note 1, 10, 3, 1137 square_note 1, 8, 1, 1089 - sound_loop 6, Cry_Teddiursa_branch_f32a2 -Cry_Teddiursa_branch_f32ae: + sound_loop 6, Cry_Teddiursa_branch_f3262 +Cry_Teddiursa_branch_f326e: square_note 1, 4, 1, 1057 square_note 1, 2, 1, 1025 - sound_loop 4, Cry_Teddiursa_branch_f32ae + sound_loop 4, Cry_Teddiursa_branch_f326e sound_ret Cry_Teddiursa_Ch6: @@ -672,12 +672,12 @@ Cry_Typhlosion_Ch8: Cry_Natu_Ch5: duty_cycle_pattern 3, 1, 3, 2 -Cry_Mantine_branch_f32e9: -Cry_Sunflora_branch_f32e9: +Cry_Mantine_branch_f32a9: +Cry_Sunflora_branch_f32a9: square_note 4, 15, 8, 1969 square_note 4, 15, 8, 1968 square_note 4, 4, 8, 1967 -Cry_Mantine_branch_f32f5: +Cry_Mantine_branch_f32b5: square_note 4, 15, 8, 1970 square_note 4, 15, 8, 1971 square_note 4, 4, 8, 1972 @@ -685,12 +685,12 @@ Cry_Mantine_branch_f32f5: Cry_Natu_Ch6: Cry_Sunflora_Ch6: -Cry_Mantine_branch_f3302: +Cry_Mantine_branch_f32c2: duty_cycle_pattern 3, 3, 0, 2 square_note 4, 15, 8, 1970 square_note 4, 15, 8, 1969 square_note 4, 2, 8, 1968 -Cry_Mantine_branch_f3310: +Cry_Mantine_branch_f32d0: square_note 4, 15, 8, 1972 square_note 4, 15, 8, 1974 square_note 4, 4, 8, 1976 @@ -698,11 +698,11 @@ Cry_Mantine_branch_f3310: Cry_Natu_Ch8: Cry_Sunflora_Ch8: -Cry_Mantine_branch_f331d: +Cry_Mantine_branch_f32dd: noise_note 4, 8, 8, 5 noise_note 4, 8, 8, 4 noise_note 4, 3, 8, 3 -Cry_Mantine_branch_f3326: +Cry_Mantine_branch_f32e6: noise_note 4, 8, 8, 5 noise_note 4, 8, 8, 4 noise_note 4, 8, 7, 4 @@ -715,30 +715,30 @@ Cry_Teddiursa_Ch8: Cry_Sunflora_Ch5: duty_cycle 0 - sound_jump Cry_Sunflora_branch_f32e9 + sound_jump Cry_Sunflora_branch_f32a9 Cry_Mantine_Ch5: duty_cycle 0 - sound_call Cry_Mantine_branch_f32e9 - sound_call Cry_Mantine_branch_f32f5 + sound_call Cry_Mantine_branch_f32a9 + sound_call Cry_Mantine_branch_f32b5 sound_ret Cry_Mantine_Ch6: - sound_call Cry_Mantine_branch_f3302 - sound_call Cry_Mantine_branch_f3310 + sound_call Cry_Mantine_branch_f32c2 + sound_call Cry_Mantine_branch_f32d0 sound_ret Cry_Mantine_Ch8: - sound_call Cry_Mantine_branch_f331d - sound_call Cry_Mantine_branch_f3326 + sound_call Cry_Mantine_branch_f32dd + sound_call Cry_Mantine_branch_f32e6 sound_ret Cry_Ampharos_Ch5: duty_cycle_pattern 3, 1, 3, 2 -Cry_Ampharos_branch_f3355: +Cry_Ampharos_branch_f3315: square_note 1, 12, 1, 1312 square_note 1, 10, 1, 1056 - sound_loop 4, Cry_Ampharos_branch_f3355 + sound_loop 4, Cry_Ampharos_branch_f3315 duty_cycle 0 square_note 4, 7, 8, 1888 square_note 4, 7, 8, 1840 @@ -833,15 +833,15 @@ Cry_Aipom_Ch5: Cry_Aipom_Ch6: duty_cycle_pattern 0, 2, 1, 3 -Cry_Aipom_branch_f3443: +Cry_Aipom_branch_f3403: square_note 1, 15, 1, 1972 - sound_loop 8, Cry_Aipom_branch_f3443 -Cry_Aipom_branch_f344b: + sound_loop 8, Cry_Aipom_branch_f3403 +Cry_Aipom_branch_f340b: square_note 1, 12, 1, 1936 - sound_loop 3, Cry_Aipom_branch_f344b -Cry_Aipom_branch_f3453: + sound_loop 3, Cry_Aipom_branch_f340b +Cry_Aipom_branch_f3413: square_note 1, 11, 1, 1933 - sound_loop 2, Cry_Aipom_branch_f3453 + sound_loop 2, Cry_Aipom_branch_f3413 square_note 16, 9, 2, 1941 sound_ret diff --git a/audio/sfx.asm b/audio/sfx.asm index 414aad9c..0e51eb1b 100644 --- a/audio/sfx.asm +++ b/audio/sfx.asm @@ -4492,18 +4492,18 @@ Sfx_Thunder_Ch8: Sfx_Supersonic_Ch5: duty_cycle 2 square_note 15, 3, -7, 1984 -Sfx_Supersonic_branch_f21ef: +Sfx_Supersonic_branch_f21ec: square_note 15, 13, -7, 1984 - sound_loop 4, Sfx_Supersonic_branch_f21ef + sound_loop 4, Sfx_Supersonic_branch_f21ec square_note 15, 13, 1, 1984 sound_ret Sfx_Supersonic_Ch6: duty_cycle_pattern 2, 3, 0, 3 square_note 15, 2, -7, 1992 -Sfx_Supersonic_branch_f2202: +Sfx_Supersonic_branch_f21ff: square_note 15, 12, -7, 1991 - sound_loop 4, Sfx_Supersonic_branch_f2202 + sound_loop 4, Sfx_Supersonic_branch_f21ff square_note 15, 12, 1, 1992 sound_ret @@ -4835,10 +4835,10 @@ Sfx_HyperBeam_Ch5: square_note 2, 15, 1, 1984 square_note 2, 15, 1, 1792 square_note 2, 15, 1, 2000 -Sfx_HyperBeam_branch_f24f8: +Sfx_HyperBeam_branch_f24f5: square_note 2, 15, 1, 1792 square_note 2, 15, 1, 2016 - sound_loop 12, Sfx_HyperBeam_branch_f24f8 + sound_loop 12, Sfx_HyperBeam_branch_f24f5 square_note 15, 15, 1, 1792 sound_ret @@ -4855,10 +4855,10 @@ Sfx_HyperBeam_Ch6: square_note 2, 15, 1, 1985 square_note 2, 15, 1, 1793 square_note 2, 15, 1, 2001 -Sfx_HyperBeam_branch_f2537: +Sfx_HyperBeam_branch_f2534: square_note 2, 15, 1, 1793 square_note 2, 15, 1, 2017 - sound_loop 12, Sfx_HyperBeam_branch_f2537 + sound_loop 12, Sfx_HyperBeam_branch_f2534 square_note 15, 15, 1, 1793 sound_ret @@ -4949,7 +4949,7 @@ Sfx_Metronome_Ch5: sound_ret Sfx_Unknown5F_Ch5: -Sfx_Unknown5F_branch_f2617: +Sfx_Unknown5F_branch_f25f5: square_note 2, 15, 7, 1537 square_note 2, 15, 7, 1793 sound_loop 8, Sfx_Unknown5F_Ch5 @@ -4959,7 +4959,7 @@ Sfx_Unknown5F_Ch6: square_note 1, 15, 7, 65535 square_note 2, 15, 7, 1538 square_note 2, 15, 7, 1794 - sound_loop 8, Sfx_Unknown5F_branch_f2617 + sound_loop 8, Sfx_Unknown5F_branch_f25f5 sound_ret Sfx_Fanfare2_Ch5: @@ -5143,9 +5143,9 @@ Sfx_Sandstorm_Ch8: Sfx_Elevator_Ch5: duty_cycle 2 pitch_sweep 5, -2 -Sfx_Elevator_branch_f2726: +Sfx_Elevator_branch_f2704: square_note 2, 15, 1, 768 - sound_loop 48, Sfx_Elevator_branch_f2726 + sound_loop 48, Sfx_Elevator_branch_f2704 pitch_sweep 0, 8 duty_cycle 2 square_note 15, 15, 3, 1840 diff --git a/data/text/battle.asm b/data/text/battle.asm index c82e24c4..506b0c0a 100644 --- a/data/text/battle.asm +++ b/data/text/battle.asm @@ -192,7 +192,7 @@ SentAllToMomText: text "Sent all to MOM!" prompt -BattleText_0x80a4f: +BattleText_0x101415: text "<RIVAL>: Huh? I" line "should've chosen" cont "your #MON!" @@ -208,7 +208,7 @@ BattleText_UseNextMon: text "Use next #MON?" done -BattleText_0x80a93: +BattleText_0x101459: text "<RIVAL>: Yes!" line "I guess I chose a" cont "good #MON!" diff --git a/data/text/common_1.asm b/data/text/common_1.asm index fd92195c..3bbffb45 100644 --- a/data/text/common_1.asm +++ b/data/text/common_1.asm @@ -202,19 +202,19 @@ Text_Warping:: text "Warping…" done -UnknownText_0x1bd05e:: +UnknownText_0x1902f9:: text "Which number" line "should be changed?" done -UnknownText_0x1bd07f:: +UnknownText_0x19031a:: text "Will you play with" line "@" text_ram wStringBuffer2 text "?" done -UnknownText_0x1bd09a:: +UnknownText_0x190335:: text "You need two #-" line "MON for breeding." prompt @@ -224,7 +224,7 @@ Text_BreedingIsNotPossible:: line "possible." prompt -UnknownText_0x1bd0d8:: +UnknownText_0x190373:: text "The compatibility" line "is @" text_decimal wBreedingCompatibility, 1, 3 @@ -232,17 +232,17 @@ UnknownText_0x1bd0d8:: cont "Should they breed?" done -UnknownText_0x1bd109:: +UnknownText_0x1903a4:: text "There is no EGG." line "" prompt -UnknownText_0x1bd11c:: +UnknownText_0x1903b7:: text "It's going to" line "hatch!" prompt -UnknownText_0x1bd131:: +UnknownText_0x1903cc:: text "Test event" line "@" text_decimal wStringBuffer2, 1, 2 @@ -256,30 +256,30 @@ UnknownText_0x1bd131:: text "You can have this." prompt -UnknownText_0x1bd188:: +UnknownText_0x190414:: text "The BOX is full!" done -UnknownText_0x1bd2a0:: +UnknownText_0x190426:: text "Obtained the" line "VOLTORBBADGE!" done -UnknownText_0x1bc42c:: +UnknownText_0x190442:: text "The password is:" line "" done -UnknownText_0x1bc43f:: +UnknownText_0x190455:: text "Is this OK?" done -UnknownText_0x1bc44c:: +UnknownText_0x190462:: text "Enter the" line "ID no." done -UnknownText_0x1bc45e:: +UnknownText_0x190474:: text "Enter the" line "amount." done diff --git a/data/text/common_2.asm b/data/text/common_2.asm index d165559d..cb1685c2 100644 --- a/data/text/common_2.asm +++ b/data/text/common_2.asm @@ -1316,7 +1316,7 @@ _MoveMonWOMailSaveText:: cont "will be saved. OK?" done -UnknownText_0x1c4693:: +UnknownText_0x195b29:: text "The window save" line "area was exceeded." done @@ -1326,7 +1326,7 @@ _WindowPoppingErrorText:: line "able for popping." done -UnknownText_0x1c46dc:: +UnknownText_0x195b72:: text "Corrupted event!" prompt diff --git a/data/text/common_3.asm b/data/text/common_3.asm index 4064b0f4..45f31824 100644 --- a/data/text/common_3.asm +++ b/data/text/common_3.asm @@ -83,7 +83,7 @@ _PhoneThankYouText:: done ; unused -UnknownText_0x1c55d6:: +UnknownText_0x198152:: text " :" done diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm index 94c90749..8da2f1c2 100644 --- a/engine/battle_anims/functions.asm +++ b/engine/battle_anims/functions.asm @@ -147,11 +147,11 @@ BattleAnimFunction_04: add hl, bc ld a, [hl] cp $88 - jr c, .asm_cd0b3 + jr c, .asm_cd002 call DeinitBattleAnimation ret -.asm_cd0b3 +.asm_cd002 add $2 ld [hl], a ld hl, BATTLEANIMSTRUCT_YCOORD @@ -194,9 +194,9 @@ BattleAnimFunction_03: add hl, bc bit 7, [hl] ld a, $0 - jr z, .asm_cd0f9 + jr z, .asm_cd048 ld a, $20 -.asm_cd0f9 +.asm_cd048 ld hl, BATTLEANIMSTRUCT_0F add hl, bc ld [hl], a @@ -255,14 +255,14 @@ BattleAnimFunction_02: add hl, bc ld a, [hl] cp $84 - jr nc, .asm_cd158 + jr nc, .asm_cd0a7 ld hl, BATTLEANIMSTRUCT_PARAM add hl, bc ld a, [hl] call Functionce64f ret -.asm_cd158 +.asm_cd0a7 call DeinitBattleAnimation ret @@ -1147,13 +1147,13 @@ BattleAnimFunction_0D: add hl, bc ld a, [hl] cp e - jr nc, .asm_cd69b + jr nc, .asm_cd5e0 call BattleAnim_IncAnonJumptableIndex xor a ldh [hLYOverrideStart], a ret -.asm_cd69b +.asm_cd5e0 dec a ld [hl], a ld hl, BATTLEANIMSTRUCT_0F @@ -1188,7 +1188,7 @@ BattleAnimFunction_0D: add hl, bc ld a, [hl] cp $70 - jr c, asm_cd6da + jr c, asm_cd61f xor a ldh [hLCDCPointer], a ldh [hLYOverrideStart], a @@ -1197,7 +1197,7 @@ BattleAnimFunction_0D: call DeinitBattleAnimation ret -asm_cd6da: +asm_cd61f: inc a inc a ld [hl], a @@ -1225,11 +1225,11 @@ Functioncd63c: add hl, bc ld a, [hl] cp $b8 - jr c, .asm_cd704 + jr c, .asm_cd649 call DeinitBattleAnimation ret -.asm_cd704 +.asm_cd649 ld a, $2 call Functionce64f ld hl, BATTLEANIMSTRUCT_0F @@ -1258,7 +1258,7 @@ Functioncd66d: add hl, bc ld a, [hl] cp $30 - jr c, .asm_cd747 + jr c, .asm_cd68c ld a, $2 call Functionce64f ld hl, BATTLEANIMSTRUCT_0F @@ -1272,7 +1272,7 @@ Functioncd66d: ld [hl], a ret -.asm_cd747 +.asm_cd68c call BattleAnim_IncAnonJumptableIndex ld a, BATTLEANIMFRAMESET_28 call ReinitBattleAnimFrameset @@ -1292,11 +1292,11 @@ Functioncd6a8: add hl, bc ld a, [hl] cp $18 - jr nc, .asm_cd76e + jr nc, .asm_cd6b3 inc [hl] ret -.asm_cd76e +.asm_cd6b3 call BattleAnim_IncAnonJumptableIndex ld a, BATTLEANIMFRAMESET_29 call ReinitBattleAnimFrameset @@ -1308,11 +1308,11 @@ BattleAnimFunction_11: add hl, bc ld a, [hl] cp $38 - jr c, .asm_cd784 + jr c, .asm_cd6c9 call DeinitBattleAnimation ret -.asm_cd784 +.asm_cd6c9 ld a, [hl] ld hl, BATTLEANIMSTRUCT_0F add hl, bc @@ -1368,11 +1368,11 @@ Functioncd717: add hl, bc ld a, [hl] and a - jr nz, .asm_cd7de + jr nz, .asm_cd723 call DeinitBattleAnimation ret -.asm_cd7de +.asm_cd723 ld hl, BATTLEANIMSTRUCT_0F add hl, bc ld a, [hl] @@ -1444,17 +1444,17 @@ Functioncd77a: ld hl, BATTLEANIMSTRUCT_PARAM add hl, bc bit 7, [hl] - jr nz, .asm_cd852 + jr nz, .asm_cd797 ld hl, BATTLEANIMSTRUCT_0F add hl, bc ld [hl], $10 - jr .asm_cd858 + jr .asm_cd79d -.asm_cd852 +.asm_cd797 ld hl, BATTLEANIMSTRUCT_0F add hl, bc ld [hl], $30 -.asm_cd858 +.asm_cd79d ld hl, BATTLEANIMSTRUCT_PARAM add hl, bc ld a, [hl] @@ -1519,17 +1519,17 @@ Functioncd7f0: ld hl, BATTLEANIMSTRUCT_PARAM add hl, bc bit 7, [hl] - jr nz, .asm_cd8be + jr nz, .asm_cd803 ld hl, BATTLEANIMSTRUCT_0F add hl, bc ld [hl], $10 - jr .asm_cd8c4 + jr .asm_cd809 -.asm_cd8be +.asm_cd803 ld hl, BATTLEANIMSTRUCT_0F add hl, bc ld [hl], $30 -.asm_cd8c4 +.asm_cd809 ld hl, BATTLEANIMSTRUCT_PARAM add hl, bc ld a, [hl] @@ -1548,13 +1548,13 @@ Functioncd811: add hl, bc ld [hl], a bit 7, a - jr nz, .asm_cd8e6 + jr nz, .asm_cd82b ld a, BATTLEANIMFRAMESET_3D - jr .asm_cd8e8 + jr .asm_cd82d -.asm_cd8e6 +.asm_cd82b ld a, BATTLEANIMFRAMESET_3C -.asm_cd8e8 +.asm_cd82d call ReinitBattleAnimFrameset ld hl, BATTLEANIMSTRUCT_0F add hl, bc @@ -1610,7 +1610,7 @@ Functioncd858: add hl, bc ld a, [hl] and a - jr z, .asm_cd950 + jr z, .asm_cd895 ld d, a ld hl, BATTLEANIMSTRUCT_10 add hl, bc @@ -1627,7 +1627,7 @@ Functioncd858: ld [hl], d ret -.asm_cd950 +.asm_cd895 call DeinitBattleAnimation ret @@ -1713,10 +1713,10 @@ Functioncd8df: add hl, bc ld a, [hl] and a - jr z, .asm_cd9d7 + jr z, .asm_cd91c cp $c2 - jr c, .asm_cd9e2 -.asm_cd9d7 + jr c, .asm_cd927 +.asm_cd91c dec a ld [hl], a and $7 @@ -1726,7 +1726,7 @@ Functioncd8df: inc [hl] ret -.asm_cd9e2 +.asm_cd927 xor a ld hl, BATTLEANIMSTRUCT_10 add hl, bc @@ -1758,11 +1758,11 @@ BattleAnimFunction_1C: add hl, bc ld a, [hl] cp $30 - jr nc, .asm_cda17 + jr nc, .asm_cd95c call DeinitBattleAnimation ret -.asm_cda17 +.asm_cd95c ld hl, BATTLEANIMSTRUCT_PARAM add hl, bc ld a, [hl] @@ -1776,10 +1776,10 @@ BattleAnimFunction_1C: srl e ld hl, BATTLEANIMSTRUCT_YCOORD add hl, bc -.asm_cda2c +.asm_cd971 inc [hl] dec e - jr nz, .asm_cda2c + jr nz, .asm_cd971 ret BattleAnimFunction_1F: @@ -1916,11 +1916,11 @@ Functioncda2e: add hl, bc ld a, [hl] cp $20 - jr c, .asm_cdaf6 + jr c, .asm_cda3b call Functioncd9d2 ret -.asm_cdaf6 +.asm_cda3b call BattleAnim_IncAnonJumptableIndex Functioncda3e: ret @@ -1951,13 +1951,13 @@ Functioncda59: add hl, bc ld a, [hl] cp $30 - jr c, .asm_cdb24 + jr c, .asm_cda69 ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX add hl, bc ld [hl], $0 ret -.asm_cdb24 +.asm_cda69 add $4 ld [hl], a ret @@ -2054,9 +2054,9 @@ Functioncdaf8: add hl, bc ld a, [hl] cp $40 - jr nc, .asm_cdbbd + jr nc, .asm_cdb02 inc [hl] -.asm_cdbbd +.asm_cdb02 call Functioncdbba ret @@ -2065,9 +2065,9 @@ Functioncdb06: add hl, bc ld a, [hl] cp $4b - jr nc, .asm_cdbcb + jr nc, .asm_cdb10 inc [hl] -.asm_cdbcb +.asm_cdb10 call Functioncdbba ret @@ -2076,16 +2076,16 @@ Functioncdb14: add hl, bc ld a, [hl] cp $88 - jr nc, .asm_cdbe6 + jr nc, .asm_cdb2b and $f - jr nz, asm_cdbfa + jr nz, asm_cdb3f ld hl, BATTLEANIMSTRUCT_10 add hl, bc ld [hl], $10 call BattleAnim_IncAnonJumptableIndex ret -.asm_cdbe6 +.asm_cdb2b call BattleAnim_IncAnonJumptableIndex inc [hl] ret @@ -2095,15 +2095,15 @@ Functioncdb30: add hl, bc ld a, [hl] and a - jr z, .asm_cdbf5 + jr z, .asm_cdb3a dec [hl] ret -.asm_cdbf5 +.asm_cdb3a ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX add hl, bc dec [hl] -asm_cdbfa: +asm_cdb3f: ld hl, BATTLEANIMSTRUCT_XCOORD add hl, bc inc [hl] @@ -2179,11 +2179,11 @@ Functioncdb9c: add hl, bc ld a, [hl] cp $30 - jr c, .asm_cdc71 + jr c, .asm_cdbb6 dec [hl] ret -.asm_cdc71 +.asm_cdbb6 call BattleAnim_IncAnonJumptableIndex Functioncdbb9: ret @@ -2225,13 +2225,13 @@ BattleAnimFunction_1E: add hl, bc ld a, [hl] and a - jr z, .asm_cdcb6 + jr z, .asm_cdbfb cp $d8 - jr nc, .asm_cdcb6 + jr nc, .asm_cdbfb call DeinitBattleAnimation ret -.asm_cdcb6 +.asm_cdbfb ld hl, BATTLEANIMSTRUCT_PARAM add hl, bc ld d, [hl] @@ -2251,14 +2251,14 @@ BattleAnimFunction_21: Functioncdc0f: ldh a, [hBattleTurn] and a - jr z, .asm_cdcd9 + jr z, .asm_cdc1e ld hl, BATTLEANIMSTRUCT_PARAM add hl, bc ld a, [hl] xor $ff add $3 ld [hl], a -.asm_cdcd9 +.asm_cdc1e call BattleAnim_IncAnonJumptableIndex ld hl, BATTLEANIMSTRUCT_0F add hl, bc @@ -2275,12 +2275,12 @@ Functioncdc32: add hl, bc ld a, [hl] and a - jr z, .asm_cdcfa + jr z, .asm_cdc3f dec [hl] call Functioncdc43 ret -.asm_cdcfa +.asm_cdc3f call DeinitBattleAnimation ret @@ -2300,7 +2300,7 @@ Functioncdc43: add hl, bc ld a, [hl] and a - jr z, .asm_cdd20 + jr z, .asm_cdc65 dec a ret z ld hl, BATTLEANIMSTRUCT_YOFFSET @@ -2308,7 +2308,7 @@ Functioncdc43: ld [hl], d ret -.asm_cdd20 +.asm_cdc65 ld hl, BATTLEANIMSTRUCT_YOFFSET add hl, bc ld a, d @@ -2373,11 +2373,11 @@ Functioncdc94: add hl, bc ld a, [hl] and $3 - jr nz, .asm_cdd87 + jr nz, .asm_cdccc ld hl, BATTLEANIMSTRUCT_YCOORD add hl, bc dec [hl] -.asm_cdd87 +.asm_cdccc and $1 ret nz ld hl, BATTLEANIMSTRUCT_XCOORD @@ -2438,7 +2438,7 @@ Functioncdd01: ld a, [hl] inc [hl] and $3f - jr z, .asm_cddf0 + jr z, .asm_cdd35 and $1f ret nz ld hl, BATTLEANIMSTRUCT_0F @@ -2446,14 +2446,14 @@ Functioncdd01: ld a, [hl] inc a ; BATTLEANIMFRAMESET_62 ; BATTLEANIMFRAMESET_9D - jr .asm_cddf5 + jr .asm_cdd3a -.asm_cddf0 +.asm_cdd35 ld hl, BATTLEANIMSTRUCT_0F add hl, bc ld a, [hl] ; BATTLEANIMFRAMESET_61 ; BATTLEANIMFRAMESET_9C -.asm_cddf5 +.asm_cdd3a call ReinitBattleAnimFrameset ret @@ -2548,11 +2548,11 @@ Functioncddb7: add hl, bc ld a, [hl] and a - jr nz, .asm_cde83 + jr nz, .asm_cddc8 ld hl, BATTLEANIMSTRUCT_01 add hl, bc set 6, [hl] -.asm_cde83 +.asm_cddc8 add BATTLEANIMFRAMESET_6A ; BATTLEANIMFRAMESET_6B BATTLEANIMFRAMESET_6C call ReinitBattleAnimFrameset Functioncddcd: @@ -2580,13 +2580,13 @@ Functioncddd5: add hl, bc ld a, e and $80 - jr nz, .asm_cdeb2 + jr nz, .asm_cddf7 ld a, e and $f ld [hl], a ret -.asm_cdeb2 +.asm_cddf7 ld a, e and $f xor $ff @@ -2601,11 +2601,11 @@ Functioncde04: add hl, bc ld a, [hl] and a - jr z, .asm_cdec9 + jr z, .asm_cde0e dec [hl] ret -.asm_cdec9 +.asm_cde0e ld hl, BATTLEANIMSTRUCT_PARAM add hl, bc ld a, [hl] @@ -2694,11 +2694,11 @@ BattleAnimFunction_2D: add hl, bc ld a, [hl] cp $28 - jr nc, .asm_cdf55 + jr nc, .asm_cde9a inc [hl] ret -.asm_cdf55 +.asm_cde9a call DeinitBattleAnimation ret @@ -2772,11 +2772,11 @@ BattleAnimFunction_34: add hl, bc ld a, [hl] cp $e8 - jr z, .asm_cdfc7 + jr z, .asm_cdf0c dec [hl] ret -.asm_cdfc7 +.asm_cdf0c call DeinitBattleAnimation ret @@ -2814,12 +2814,12 @@ BattleAnimFunction_3C: add hl, bc ld a, [hl] cp $d0 - jr z, .asm_ce007 + jr z, .asm_cdf4c dec [hl] dec [hl] ret -.asm_ce007 +.asm_cdf4c call DeinitBattleAnimation ret @@ -2843,10 +2843,10 @@ Functioncdf68: add hl, bc ld a, [hl] cp $6c - jr c, .asm_ce02d + jr c, .asm_cdf72 ret -.asm_ce02d +.asm_cdf72 ld a, $2 call Functionce64f ld hl, BATTLEANIMSTRUCT_0F @@ -2857,10 +2857,10 @@ Functioncdf68: ld d, [hl] call BattleAnim_Sine bit 7, a - jr nz, .asm_ce046 + jr nz, .asm_cdf8b xor $ff inc a -.asm_ce046 +.asm_cdf8b ld hl, BATTLEANIMSTRUCT_YOFFSET add hl, bc ld [hl], a @@ -2974,9 +2974,9 @@ Functionce022: ld hl, BATTLEANIMSTRUCT_YOFFSET add hl, bc bit 7, a - jr z, .asm_ce0f0 + jr z, .asm_ce035 ld [hl], a -.asm_ce0f0 +.asm_ce035 ld hl, BATTLEANIMSTRUCT_0F add hl, bc ld a, [hl] @@ -2987,11 +2987,11 @@ Functionce03d: add hl, bc ld a, [hl] cp $84 - jr c, .asm_ce105 + jr c, .asm_ce04a call DeinitBattleAnimation ret -.asm_ce105 +.asm_ce04a ld hl, BATTLEANIMSTRUCT_PARAM add hl, bc ld a, [hl] @@ -3031,11 +3031,11 @@ Functionce06f: ld hl, BATTLEANIMSTRUCT_PARAM add hl, bc and [hl] - jr nz, .asm_ce149 + jr nz, .asm_ce08e ld hl, BATTLEANIMSTRUCT_XCOORD add hl, bc dec [hl] -.asm_ce149 +.asm_ce08e ld hl, BATTLEANIMSTRUCT_0F add hl, bc inc [hl] @@ -3073,38 +3073,38 @@ BattleAnimFunction_2F: inc [hl] ld a, [hl] and $1 - jr nz, .asm_ce189 + jr nz, .asm_ce0ce ld hl, BATTLEANIMSTRUCT_XCOORD add hl, bc dec [hl] -.asm_ce189 +.asm_ce0ce ld hl, BATTLEANIMSTRUCT_PARAM add hl, bc ld a, [hl] and $3 - jr nz, .asm_ce197 + jr nz, .asm_ce0dc ld hl, BATTLEANIMSTRUCT_YCOORD add hl, bc inc [hl] -.asm_ce197 +.asm_ce0dc ld hl, BATTLEANIMSTRUCT_XCOORD add hl, bc ld a, [hl] ld hl, BATTLEANIMSTRUCT_0F add hl, bc cp $5a - jr nc, .asm_ce1aa + jr nc, .asm_ce0ef ld a, [hl] and a - jr z, .asm_ce1ac + jr z, .asm_ce0f1 dec [hl] ret -.asm_ce1aa +.asm_ce0ef inc [hl] ret -.asm_ce1ac +.asm_ce0f1 call DeinitBattleAnimation ret @@ -3135,11 +3135,11 @@ BattleAnimFunction_42: ld hl, BATTLEANIMSTRUCT_0F add hl, bc cp $40 - jr nc, .asm_ce1df + jr nc, .asm_ce124 inc [hl] ret -.asm_ce1df +.asm_ce124 ld a, [hl] dec [hl] and a @@ -3229,13 +3229,13 @@ Functionce1a5: call BattleAnim_IncAnonJumptableIndex ldh a, [hBattleTurn] and a - jr nz, .asm_ce26c + jr nz, .asm_ce1b1 ld a, $f0 - jr .asm_ce26e + jr .asm_ce1b3 -.asm_ce26c +.asm_ce1b1 ld a, $cc -.asm_ce26e +.asm_ce1b3 ld hl, BATTLEANIMSTRUCT_0F add hl, bc ld [hl], a @@ -3262,12 +3262,12 @@ Functionce1ce: add hl, bc ld a, [hl] cp $d0 - jr nc, .asm_ce29b + jr nc, .asm_ce1e0 ld a, $4 call Functionce64f ret -.asm_ce29b +.asm_ce1e0 call DeinitBattleAnimation ret @@ -3282,13 +3282,13 @@ Functionce1e4: ld d, $0 ldh a, [hSGB] and a - jr nz, .asm_ce2b6 + jr nz, .asm_ce1fb ld hl, Unknown_ce209 - jr .asm_ce2b9 + jr .asm_ce1fe -.asm_ce2b6 +.asm_ce1fb ld hl, Unknown_ce20d -.asm_ce2b9 +.asm_ce1fe add hl, de ld a, [hl] ld hl, BATTLEANIMSTRUCT_0F @@ -3344,14 +3344,14 @@ Functionce24b: add hl, bc ld a, [hl] cp $e0 - jr nz, .asm_ce319 + jr nz, .asm_ce25e call BattleAnim_IncAnonJumptableIndex ld hl, BATTLEANIMSTRUCT_0F add hl, bc ld [hl], $2 ret -.asm_ce319 +.asm_ce25e ld d, a ld hl, BATTLEANIMSTRUCT_0F add hl, bc @@ -3373,11 +3373,11 @@ Functionce275: add hl, bc ld a, [hl] and a - jr z, .asm_ce33a + jr z, .asm_ce27f dec [hl] ret -.asm_ce33a +.asm_ce27f ld [hl], $4 ld hl, BATTLEANIMSTRUCT_0F add hl, bc @@ -3396,12 +3396,12 @@ Functionce291: add hl, bc ld a, [hl] cp $84 - jr nc, .asm_ce35b + jr nc, .asm_ce2a0 ld a, $4 call Functionce64f ret -.asm_ce35b +.asm_ce2a0 call DeinitBattleAnimation ret @@ -3423,13 +3423,13 @@ Functionce2ba: ld hl, BATTLEANIMSTRUCT_PARAM add hl, bc bit 7, [hl] - jr nz, .asm_ce383 + jr nz, .asm_ce2c8 ld hl, BATTLEANIMSTRUCT_XOFFSET add hl, bc inc [hl] ret -.asm_ce383 +.asm_ce2c8 ld hl, BATTLEANIMSTRUCT_XOFFSET add hl, bc dec [hl] @@ -3454,11 +3454,11 @@ Functionce2e1: add hl, bc ld a, [hl] and a - jr z, .asm_ce3a6 + jr z, .asm_ce2eb dec [hl] ret -.asm_ce3a6 +.asm_ce2eb call BattleAnim_IncAnonJumptableIndex ld a, BATTLEANIMFRAMESET_20 call ReinitBattleAnimFrameset @@ -3493,11 +3493,11 @@ BattleAnimFunction_3A: add hl, bc ld a, [hl] cp $20 - jr c, .asm_ce3df + jr c, .asm_ce324 call DeinitBattleAnimation ret -.asm_ce3df +.asm_ce324 ld hl, BATTLEANIMSTRUCT_PARAM add hl, bc ld a, [hl] @@ -3594,7 +3594,7 @@ Functionce3aa: add hl, bc ld a, [hl] and a - jr z, .asm_ce48b + jr z, .asm_ce3d0 dec [hl] add $8 ld d, a @@ -3615,7 +3615,7 @@ Functionce3aa: ld [hl], a ret -.asm_ce48b +.asm_ce3d0 ld [hl], $10 call BattleAnim_IncAnonJumptableIndex Functionce3d5: @@ -3646,7 +3646,7 @@ Functionce3f5: add hl, bc ld a, [hl] cp $38 - jr nc, .asm_ce4d8 + jr nc, .asm_ce41d inc [hl] ld hl, BATTLEANIMSTRUCT_0F add hl, bc @@ -3667,7 +3667,7 @@ Functionce3f5: dec [hl] ret -.asm_ce4d8 +.asm_ce41d call DeinitBattleAnimation ret @@ -3684,10 +3684,10 @@ BattleAnimFunction_41: inc [hl] call BattleAnim_Sine bit 7, a - jr nz, .asm_ce4f4 + jr nz, .asm_ce439 xor $ff inc a -.asm_ce4f4 +.asm_ce439 ld hl, BATTLEANIMSTRUCT_YOFFSET add hl, bc ld [hl], a @@ -3706,7 +3706,7 @@ BattleAnimFunction_43: add hl, bc ld a, [hl] cp $10 - jr nc, .asm_ce52e + jr nc, .asm_ce473 inc [hl] inc [hl] ld d, a @@ -3727,7 +3727,7 @@ BattleAnimFunction_43: ld [hl], a ret -.asm_ce52e +.asm_ce473 call DeinitBattleAnimation ret @@ -3785,7 +3785,7 @@ Functionce4bc: add hl, bc ld a, [hl] cp $80 - jr nc, .asm_ce58b + jr nc, .asm_ce4d0 ld d, a add $8 ld [hl], a @@ -3794,7 +3794,7 @@ Functionce4bc: ld a, [hl] jr asm_ce4d4 -.asm_ce58b +.asm_ce4d0 call DeinitBattleAnimation ret @@ -3813,7 +3813,7 @@ Functionce4df: add hl, bc ld a, [hl] cp $30 - jr c, .asm_ce5b0 + jr c, .asm_ce4f5 ld hl, BATTLEANIMSTRUCT_XCOORD add hl, bc dec [hl] @@ -3824,7 +3824,7 @@ Functionce4df: inc [hl] ret -.asm_ce5b0 +.asm_ce4f5 call DeinitBattleAnimation Functionce4f8: ret @@ -3945,9 +3945,9 @@ Functionce58d: ld a, [hl] add $4 cp $70 - jr c, .asm_ce654 + jr c, .asm_ce599 xor a -.asm_ce654 +.asm_ce599 ld [hl], a ld hl, BATTLEANIMSTRUCT_XOFFSET add hl, bc @@ -3961,9 +3961,9 @@ Functionce5a1: ld a, [hl] add $4 cp $70 - jr c, .asm_ce668 + jr c, .asm_ce5ad xor a -.asm_ce668 +.asm_ce5ad ld [hl], a ld hl, BATTLEANIMSTRUCT_XOFFSET add hl, bc @@ -3978,9 +3978,9 @@ Functionce5b7: ld a, [hl] add $4 cp $70 - jr c, .asm_ce67e + jr c, .asm_ce5c3 xor a -.asm_ce67e +.asm_ce5c3 ld [hl], a ld hl, BATTLEANIMSTRUCT_XOFFSET add hl, bc @@ -4047,7 +4047,7 @@ BattleAnimFunction_4D: add hl, bc ld a, [hl] cp $20 - jr nc, .asm_ce6ed + jr nc, .asm_ce632 inc [hl] ld hl, BATTLEANIMSTRUCT_PARAM add hl, bc @@ -4060,7 +4060,7 @@ BattleAnimFunction_4D: ld [hl], a ret -.asm_ce6ed +.asm_ce632 call DeinitBattleAnimation ret @@ -4091,10 +4091,10 @@ Functionce64f: srl e ld hl, BATTLEANIMSTRUCT_YCOORD add hl, bc -.asm_ce719 +.asm_ce65e dec [hl] dec e - jr nz, .asm_ce719 + jr nz, .asm_ce65e ret BattleAnim_AnonJumptable: diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm index ce8a64d6..44466c82 100644 --- a/engine/events/npc_trade.asm +++ b/engine/events/npc_trade.asm @@ -283,14 +283,14 @@ CopyTradeName: call CopyBytes ret -Unreferenced_Functionfcdfb: +Unreferenced_Functionfcbc7: ld bc, 4 call CopyBytes ld a, "@" ld [de], a ret -Unreferenced_Functionfce05: +Unreferenced_Functionfcbd1: ld bc, 3 call CopyBytes ld a, "@" diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index c894d9bd..466c0109 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -1066,14 +1066,14 @@ TryStrengthOW: WhirlpoolFunction: call FieldMoveJumptableReset .loop - ld hl, Jumptable_cdae + ld hl, Jumptable_cdb1 call FieldMoveJumptable jr nc, .loop and $7f ld [wFieldMoveSucceeded], a ret -Jumptable_cdae: +Jumptable_cdb1: dw .TryWhirlpool dw .DoWhirlpool dw .FailWhirlpool diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index 0fb65851..3288e486 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -303,7 +303,7 @@ _CGB_BillsPC: ldh [hCGBPalUpdate], a ret -Function9009: +Function95a0: ld hl, BillsPCOrangePalette call LoadHLPaletteIntoDE jr .GotPalette diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index b9755cb8..a8040590 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1212,7 +1212,7 @@ StatStrings: GetStatExpRelativePointer: ld a, [wCurItem] - ld hl, Table_eeeb + ld hl, Table_ef3f .next cp [hl] inc hl @@ -1226,7 +1226,7 @@ GetStatExpRelativePointer: ld b, 0 ret -Table_eeeb: +Table_ef3f: db HP_UP, MON_HP_EXP - MON_STAT_EXP db PROTEIN, MON_ATK_EXP - MON_STAT_EXP db IRON, MON_DEF_EXP - MON_STAT_EXP @@ -1347,7 +1347,7 @@ HealPowderEffect: call UseStatusHealer cp $0 - jr nz, .asm_efc9 + jr nz, .asm_f01f ld c, HAPPINESS_BITTERPOWDER farcall ChangeHappiness @@ -1355,7 +1355,7 @@ HealPowderEffect: ld a, $0 -.asm_efc9 +.asm_f01f jp StatusHealer_Jumptable StatusHealingEffect: @@ -1481,14 +1481,14 @@ RevivalHerbEffect: call RevivePokemon cp 0 - jr nz, .asm_f0c5 + jr nz, .asm_f11b ld c, HAPPINESS_REVIVALHERB farcall ChangeHappiness call LooksBitterMessage ld a, 0 -.asm_f0c5 +.asm_f11b jp StatusHealer_Jumptable ReviveEffect: diff --git a/engine/link/link.asm b/engine/link/link.asm index 79571fa4..3b225347 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -2333,7 +2333,7 @@ CableClubCheckWhichChris: LinkCommsBorderGFX: INCBIN "gfx/trade/border_tiles.2bpp" -Unreferenced_Function29fe4: +Unreferenced_Function29deb: ld a, BANK(sPartyMail) call OpenSRAM ld d, FALSE diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index a3899f05..25245576 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -922,7 +922,7 @@ MapObjectMovementPattern: and %00000011 ld e, a ld d, 0 - ld hl, .data_4a81 + ld hl, .data_4a5a add hl, de add hl, de ld d, [hl] @@ -939,7 +939,7 @@ MapObjectMovementPattern: ld [hl], STEP_TYPE_TRACKING_OBJECT ret -.data_4a81 +.data_4a5a ; x, y db 0, -4 db 0, 8 diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 8be4e96c..b0d448af 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -498,16 +498,16 @@ _MovePKMNWithoutMail: inc a ld [wBillsPC_LoadedBox], a call DelayFrame -.asm_e2781 +.asm_e2f6f call JoyTextDelay ld a, [wJumptableIndex] bit 7, a - jr nz, .asm_e2793 + jr nz, .asm_e2f81 call .RunJumptable call DelayFrame - jr .asm_e2781 + jr .asm_e2f6f -.asm_e2793 +.asm_e2f81 call ClearSprites pop af ldh [hInMenu], a diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm index 570abe5f..d9be5824 100644 --- a/gfx/sgb/pal_packets.asm +++ b/gfx/sgb/pal_packets.asm @@ -61,7 +61,7 @@ PalPacket_BattleGrayscale: PalPacket_Pokegear: sgb_pal_set POKEGEAR, ROUTES, ROUTES, ROUTES -UnreferencedPalPacket_9c86: +UnreferencedPalPacket_a0f5: sgb_pal_set PACK, ROUTES, ROUTES, ROUTES PalPacket_SlotMachine: diff --git a/home/map_objects.asm b/home/map_objects.asm index 913b0db8..738da1f6 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -237,7 +237,7 @@ CheckObjectTime:: ld a, [hl] cp -1 jr z, .timeofday_always - ld hl, .TimeOfDayValues_191e + ld hl, .TimeOfDayValues_17bb ld a, [wTimeOfDay] add l ld l, a @@ -257,7 +257,7 @@ CheckObjectTime:: and a ret -.TimeOfDayValues_191e: +.TimeOfDayValues_17bb: ; entries correspond to TimeOfDay values db MORN db DAY @@ -362,7 +362,7 @@ CopyPlayerObjectTemplate:: call CopyBytes ret -Unreferenced_Function19b8: +Unreferenced_Function1855: call GetMapObject ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 21ae9739..626ed145 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -23,9 +23,9 @@ FastShip1F_MapScripts: end .EnterFastShipScript: - applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e - applymovement PLAYER, MovementData_0x75217 - applymovement FASTSHIP1F_SAILOR1, MovementData_0x75211 + applymovement FASTSHIP1F_SAILOR1, MovementData_0x16c980 + applymovement PLAYER, MovementData_0x16c989 + applymovement FASTSHIP1F_SAILOR1, MovementData_0x16c983 pause 30 playsound SFX_BOAT earthquake 30 @@ -89,13 +89,13 @@ FastShip1FSailor1Script: .LetThePlayerOut: readvar VAR_FACING ifequal RIGHT, .YouAreFacingRight - applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e - applymovement PLAYER, MovementData_0x75235 + applymovement FASTSHIP1F_SAILOR1, MovementData_0x16c980 + applymovement PLAYER, MovementData_0x16c9a7 end .YouAreFacingRight: - applymovement FASTSHIP1F_SAILOR1, MovementData_0x75214 - applymovement PLAYER, MovementData_0x75238 + applymovement FASTSHIP1F_SAILOR1, MovementData_0x16c986 + applymovement PLAYER, MovementData_0x16c9aa end FastShip1FSailor2Script: @@ -122,53 +122,53 @@ WorriedGrandpaSceneRight: WorriedGrandpaSceneLeft: appear FASTSHIP1F_GENTLEMAN - applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x7521b + applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x16c98d playsound SFX_TACKLE - applymovement PLAYER, MovementData_0x7522e - applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75220 + applymovement PLAYER, MovementData_0x16c9a0 + applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x16c992 opentext writetext FastShip1FGrandpaText waitbutton closetext turnobject PLAYER, RIGHT - applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222 + applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x16c994 disappear FASTSHIP1F_GENTLEMAN setscene SCENE_DEFAULT end -MovementData_0x7520e: +MovementData_0x16c980: slow_step LEFT turn_head RIGHT step_end -MovementData_0x75211: +MovementData_0x16c983: slow_step RIGHT turn_head DOWN step_end -MovementData_0x75214: +MovementData_0x16c986: slow_step DOWN turn_head UP step_end -MovementData_0x75217: +MovementData_0x16c989: step DOWN step DOWN turn_head DOWN step_end -MovementData_0x7521b: +MovementData_0x16c98d: big_step RIGHT big_step RIGHT big_step RIGHT big_step RIGHT step_end -MovementData_0x75220: +MovementData_0x16c992: step RIGHT step_end -MovementData_0x75222: +MovementData_0x16c994: big_step DOWN big_step RIGHT big_step RIGHT @@ -182,25 +182,25 @@ MovementData_0x75222: big_step DOWN step_end -MovementData_0x7522e: +MovementData_0x16c9a0: big_step RIGHT turn_head LEFT step_end -MovementData_0x75231: +MovementData_0x16c9a3: step UP step_end -MovementData_0x75233: +MovementData_0x16c9a5: step DOWN step_end -MovementData_0x75235: +MovementData_0x16c9a7: step UP step UP step_end -MovementData_0x75238: +MovementData_0x16c9aa: step RIGHT step UP step_end diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 9ed2372e..0f86465e 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -49,7 +49,7 @@ SSAquaGranddaughterBefore: special FadeBlackQuickly special ReloadSpritesNoPalettes disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2 - applymovement PLAYER, MovementData_0x76004 + applymovement PLAYER, MovementData_0x16d700 moveobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, 3, 19 appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1 turnobject PLAYER, UP @@ -57,14 +57,14 @@ SSAquaGranddaughterBefore: special FadeInQuickly turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN showemote EMOTE_SHOCK, FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, 15 - applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, MovementData_0x7600c + applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, MovementData_0x16d708 turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT opentext writetext SSAquaGranddaughterWasPlayingMText waitbutton closetext turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN - applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, MovementData_0x76010 + applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, MovementData_0x16d70c opentext writetext SSAquaEntertainedGranddaughterText promptbutton @@ -208,7 +208,7 @@ TrainerSupernerdShawn: FastShipCaptainsCabinTrashcan: jumpstd TrashCanScript -MovementData_0x76004: +MovementData_0x16d700: big_step RIGHT big_step UP big_step UP @@ -218,13 +218,13 @@ MovementData_0x76004: big_step UP step_end -MovementData_0x7600c: +MovementData_0x16d708: step UP step UP turn_head LEFT step_end -MovementData_0x76010: +MovementData_0x16d70c: step DOWN step_end diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 572be600..85f261fa 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -154,7 +154,7 @@ MahoganyMart1FLanceGoDownStairsMovement: slow_step RIGHT step_end -UnknownText_0x6c414: +UnknownText_0x1140cb: text "Hello, youngster!" para "How would you like" diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index f9b04f44..d76b3383 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -26,13 +26,13 @@ MahoganyTown_MapScripts: MahoganyTownTryARageCandyBarScript: showemote EMOTE_SHOCK, MAHOGANYTOWN_POKEFAN_M, 15 - applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900a9 + applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x124b5e follow PLAYER, MAHOGANYTOWN_POKEFAN_M - applymovement PLAYER, MovementData_0x1900a7 + applymovement PLAYER, MovementData_0x124b5c stopfollow turnobject PLAYER, RIGHT scall RageCandyBarMerchantScript - applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900ad + applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x124b62 end MahoganyTownPokefanMScript: @@ -121,21 +121,21 @@ MahoganyGymSign: MahoganyTownPokecenterSign: jumpstd PokecenterSignScript -MovementData_0x1900a4: +MovementData_0x124b59: step DOWN big_step UP turn_head DOWN -MovementData_0x1900a7: +MovementData_0x124b5c: step LEFT step_end -MovementData_0x1900a9: +MovementData_0x124b5e: step RIGHT step DOWN turn_head LEFT step_end -MovementData_0x1900ad: +MovementData_0x124b62: step UP turn_head DOWN step_end diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 18c4748d..dfcf8877 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -30,15 +30,15 @@ OlivineCityRivalSceneTop: playsound SFX_ENTER_DOOR appear OLIVINECITY_OLIVINE_RIVAL waitsfx - applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88d2 + applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1240af playmusic MUSIC_RIVAL_ENCOUNTER opentext writetext OlivineCityRivalText waitbutton closetext - applymovement PLAYER, MovementData_0x1a88f4 + applymovement PLAYER, MovementData_0x1240d1 turnobject PLAYER, RIGHT - applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db + applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1240b8 setscene SCENE_FINISHED disappear OLIVINECITY_OLIVINE_RIVAL special RestartMapMusic @@ -54,15 +54,15 @@ OlivineCityRivalSceneBottom: playsound SFX_ENTER_DOOR appear OLIVINECITY_OLIVINE_RIVAL waitsfx - applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88d6 + applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1240b3 playmusic MUSIC_RIVAL_ENCOUNTER opentext writetext OlivineCityRivalText waitbutton closetext - applymovement PLAYER, MovementData_0x1a88f7 + applymovement PLAYER, MovementData_0x1240d4 turnobject PLAYER, RIGHT - applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8 + applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1240c5 disappear OLIVINECITY_OLIVINE_RIVAL setscene SCENE_FINISHED special RestartMapMusic @@ -110,20 +110,20 @@ OlivineCityPokecenterSign: OlivineCityMartSign: jumpstd MartSignScript -MovementData_0x1a88d2: +MovementData_0x1240af: step DOWN step RIGHT step RIGHT step_end -MovementData_0x1a88d6: +MovementData_0x1240b3: step DOWN step DOWN step RIGHT step RIGHT step_end -MovementData_0x1a88db: +MovementData_0x1240b8: step RIGHT step RIGHT step RIGHT @@ -138,7 +138,7 @@ MovementData_0x1a88db: step UP step_end -MovementData_0x1a88e8: +MovementData_0x1240c5: step RIGHT step RIGHT step RIGHT @@ -152,12 +152,12 @@ MovementData_0x1a88e8: step UP step_end -MovementData_0x1a88f4: +MovementData_0x1240d1: step DOWN turn_head UP step_end -MovementData_0x1a88f7: +MovementData_0x1240d4: step UP turn_head DOWN step_end diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 94792f8b..566f4239 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -70,17 +70,17 @@ OlivineLighthouseJasmine: readvar VAR_FACING ifequal DOWN, .FacingDown ifequal RIGHT, .FacingRight - applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c68 + applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x112da4 disappear OLIVINELIGHTHOUSE6F_JASMINE end .FacingDown: - applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c70 + applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x112dac disappear OLIVINELIGHTHOUSE6F_JASMINE end .FacingRight: - applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c79 + applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x112db5 disappear OLIVINELIGHTHOUSE6F_JASMINE end @@ -129,7 +129,7 @@ OlivineLighthouseAmphy: OlivineLighthouse6FSuperPotion: itemball SUPER_POTION -MovementData_0x60c68: +MovementData_0x112da4: slow_step UP slow_step UP slow_step RIGHT @@ -139,7 +139,7 @@ MovementData_0x60c68: step_sleep 8 step_end -MovementData_0x60c70: +MovementData_0x112dac: slow_step DOWN slow_step RIGHT slow_step RIGHT @@ -150,7 +150,7 @@ MovementData_0x60c70: slow_step RIGHT step_end -MovementData_0x60c79: +MovementData_0x112db5: slow_step UP slow_step UP slow_step RIGHT diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 5489724e..1982546f 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -22,7 +22,7 @@ OlivinePort_MapScripts: end .LeaveFastShipScript: - applymovement PLAYER, MovementData_0x74a32 + applymovement PLAYER, MovementData_0x16c190 appear OLIVINEPORT_SAILOR1 setscene SCENE_DEFAULT setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 @@ -42,7 +42,7 @@ OlivinePortSailorAtGangwayScript: playsound SFX_EXIT_BUILDING disappear OLIVINEPORT_SAILOR1 waitsfx - applymovement PLAYER, MovementData_0x74a30 + applymovement PLAYER, MovementData_0x16c18e playsound SFX_EXIT_BUILDING special FadeOutPalettes waitsfx @@ -100,28 +100,28 @@ OlivinePortWalkUpToShipScript: waitbutton closetext setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 - applymovement PLAYER, MovementData_0x74a37 + applymovement PLAYER, MovementData_0x16c195 sjump OlivinePortSailorAtGangwayScript .NoTicket: writetext OlivinePortNoTicketText waitbutton closetext - applymovement PLAYER, MovementData_0x74a34 + applymovement PLAYER, MovementData_0x16c192 end .NextShipMonday: writetext OlivinePortMondayShipText waitbutton closetext - applymovement PLAYER, MovementData_0x74a34 + applymovement PLAYER, MovementData_0x16c192 end .NextShipFriday: writetext OlivinePortFridayShipText waitbutton closetext - applymovement PLAYER, MovementData_0x74a34 + applymovement PLAYER, MovementData_0x16c192 end .skip: @@ -137,7 +137,7 @@ OlivinePortNotRidingMoveAwayScript: writetext OlivinePortComeAgainText waitbutton closetext - applymovement PLAYER, MovementData_0x74a34 + applymovement PLAYER, MovementData_0x16c192 end OlivinePortSailorAfterHOFScript: @@ -167,11 +167,11 @@ OlivinePortSailorAfterHOFScript: setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 readvar VAR_FACING ifequal RIGHT, .Right - applymovement PLAYER, MovementData_0x74a3f + applymovement PLAYER, MovementData_0x16c19d sjump OlivinePortSailorAtGangwayScript .Right: - applymovement PLAYER, MovementData_0x74a49 + applymovement PLAYER, MovementData_0x16c1a7 sjump OlivinePortSailorAtGangwayScript .NoTicket: @@ -234,20 +234,20 @@ OlivinePortCooltrainerFScript: OlivinePortHiddenProtein: hiddenitem PROTEIN, EVENT_OLIVINE_PORT_HIDDEN_PROTEIN -MovementData_0x74a30: +MovementData_0x16c18e: step DOWN step_end -MovementData_0x74a32: +MovementData_0x16c190: step UP step_end -MovementData_0x74a34: +MovementData_0x16c192: step RIGHT turn_head LEFT step_end -MovementData_0x74a37: +MovementData_0x16c195: step DOWN step DOWN step DOWN @@ -257,7 +257,7 @@ MovementData_0x74a37: step DOWN step_end -MovementData_0x74a3f: +MovementData_0x16c19d: step RIGHT step DOWN step DOWN @@ -269,7 +269,7 @@ MovementData_0x74a3f: step DOWN step_end -MovementData_0x74a49: +MovementData_0x16c1a7: step UP step RIGHT step RIGHT diff --git a/maps/Route25.asm b/maps/Route25.asm index 91126ef4..399a76ec 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -29,21 +29,21 @@ Route25MistyDate1Script: pause 30 showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10 turnobject ROUTE25_MISTY, DOWN - applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efe8 + applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x1408c9 disappear ROUTE25_COOLTRAINER_M1 pause 15 playmusic MUSIC_BEAUTY_ENCOUNTER turnobject ROUTE25_MISTY, UP pause 10 - applymovement ROUTE25_MISTY, MovementData_0x19efed + applymovement ROUTE25_MISTY, MovementData_0x1408ce opentext writetext Route25MistyDateText waitbutton closetext turnobject PLAYER, DOWN - applymovement ROUTE25_MISTY, MovementData_0x19effa + applymovement ROUTE25_MISTY, MovementData_0x1408db turnobject PLAYER, LEFT - applymovement ROUTE25_MISTY, MovementData_0x19f000 + applymovement ROUTE25_MISTY, MovementData_0x1408e1 disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM setscene SCENE_ROUTE25_NOTHING @@ -55,21 +55,21 @@ Route25MistyDate2Script: pause 30 showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10 turnobject ROUTE25_MISTY, DOWN - applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efea + applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x1408cb disappear ROUTE25_COOLTRAINER_M1 pause 15 playmusic MUSIC_BEAUTY_ENCOUNTER turnobject ROUTE25_MISTY, UP pause 10 - applymovement ROUTE25_MISTY, MovementData_0x19eff4 + applymovement ROUTE25_MISTY, MovementData_0x1408d5 opentext writetext Route25MistyDateText waitbutton closetext turnobject PLAYER, UP - applymovement ROUTE25_MISTY, MovementData_0x19effd + applymovement ROUTE25_MISTY, MovementData_0x1408de turnobject PLAYER, LEFT - applymovement ROUTE25_MISTY, MovementData_0x19f000 + applymovement ROUTE25_MISTY, MovementData_0x1408e1 disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM setscene SCENE_ROUTE25_NOTHING @@ -191,16 +191,16 @@ Route25Protein: Route25HiddenPotion: hiddenitem POTION, EVENT_ROUTE_25_HIDDEN_POTION -MovementData_0x19efe8: +MovementData_0x1408c9: big_step DOWN step_end -MovementData_0x19efea: +MovementData_0x1408cb: big_step DOWN big_step DOWN step_end -MovementData_0x19efed: +MovementData_0x1408ce: step UP step UP step UP @@ -209,7 +209,7 @@ MovementData_0x19efed: step LEFT step_end -MovementData_0x19eff4: +MovementData_0x1408d5: step UP step UP step LEFT @@ -217,17 +217,17 @@ MovementData_0x19eff4: step LEFT step_end -MovementData_0x19effa: +MovementData_0x1408db: step DOWN step LEFT step_end -MovementData_0x19effd: +MovementData_0x1408de: step UP step LEFT step_end -MovementData_0x19f000: +MovementData_0x1408e1: step LEFT step LEFT step LEFT diff --git a/maps/Route27.asm b/maps/Route27.asm index ad1efd85..9a7f6010 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -25,13 +25,13 @@ Route27_MapScripts: FirstStepIntoKantoLeftScene: turnobject ROUTE27_FISHER, LEFT showemote EMOTE_SHOCK, ROUTE27_FISHER, 15 - applymovement ROUTE27_FISHER, MovementData_0x1a0a66 + applymovement ROUTE27_FISHER, MovementData_0x128865 sjump FirstStepIntoKantoScene_Continue FirstStepIntoKantoRightScene: turnobject ROUTE27_FISHER, LEFT showemote EMOTE_SHOCK, ROUTE27_FISHER, 15 - applymovement ROUTE27_FISHER, MovementData_0x1a0a69 + applymovement ROUTE27_FISHER, MovementData_0x128868 FirstStepIntoKantoScene_Continue: turnobject PLAYER, RIGHT opentext @@ -265,12 +265,12 @@ Route27TMSolarbeam: Route27RareCandy: itemball RARE_CANDY -MovementData_0x1a0a66: +MovementData_0x128865: step LEFT step LEFT step_end -MovementData_0x1a0a69: +MovementData_0x128868: step LEFT step_end diff --git a/maps/Route40.asm b/maps/Route40.asm index 088f7405..6c45e6b4 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -117,7 +117,7 @@ Route40Rock: Route40HiddenHyperPotion: hiddenitem HYPER_POTION, EVENT_ROUTE_40_HIDDEN_HYPER_POTION -MovementData_0x1a621c: +MovementData_0x130f71: step RIGHT step UP step UP @@ -127,7 +127,7 @@ MovementData_0x1a621c: step UP step_end -MovementData_0x1a6224: +MovementData_0x130f79: step UP step UP step UP @@ -135,7 +135,7 @@ MovementData_0x1a6224: step UP step_end -MovementData_0x1a622a: +MovementData_0x130f7f: step UP step UP step UP diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 5600660c..58975839 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -60,10 +60,10 @@ RuinsOfAlphOutsideScientistSceneContinue: closetext playmusic MUSIC_SHOW_ME_AROUND follow RUINSOFALPHOUTSIDE_SCIENTIST, PLAYER - applymovement RUINSOFALPHOUTSIDE_SCIENTIST, MovementData_0x580ba + applymovement RUINSOFALPHOUTSIDE_SCIENTIST, MovementData_0x110092 disappear RUINSOFALPHOUTSIDE_SCIENTIST stopfollow - applymovement PLAYER, MovementData_0x580c5 + applymovement PLAYER, MovementData_0x11009d setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX warpcheck end @@ -99,7 +99,7 @@ RuinsOfAlphSign: RuinsOfAlphResearchCenterSign: jumptext RuinsOfAlphResearchCenterSignText -MovementData_0x580ba: +MovementData_0x110092: step RIGHT step RIGHT step RIGHT @@ -112,7 +112,7 @@ MovementData_0x580ba: step UP step_end -MovementData_0x580c5: +MovementData_0x11009d: step UP step_end diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index c5840c41..05948048 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -29,7 +29,7 @@ RuinsOfAlphResearchCenter_MapScripts: return .GetUnownDexScript: - applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x5926f + applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x110b15 playsound SFX_BOOT_PC pause 60 playsound SFX_SWITCH_POKEMON @@ -43,7 +43,7 @@ RuinsOfAlphResearchCenter_MapScripts: writetext RuinsOfAlphResearchCenterModifiedDexText waitbutton closetext - applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59274 + applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x110b1a opentext writetext RuinsOfAlphResearchCenterDexUpgradedText playsound SFX_ITEM @@ -52,7 +52,7 @@ RuinsOfAlphResearchCenter_MapScripts: writetext RuinsOfAlphResearchCenterScientist3Text waitbutton closetext - applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59276 + applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x110b1c setscene SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING special RestartMapMusic end @@ -157,18 +157,18 @@ RuinsOfAlphResearchCenterPhoto: RuinsOfAlphResearchCenterBookshelf: jumptext RuinsOfAlphResearchCenterAcademicBooksText -MovementData_0x5926f: +MovementData_0x110b15: step UP step UP step LEFT turn_head UP step_end -MovementData_0x59274: +MovementData_0x110b1a: step DOWN step_end -MovementData_0x59276: +MovementData_0x110b1c: step UP step_end diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 7f521c65..7c84971e 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -31,8 +31,8 @@ SproutTower3FRivalScene: playsound SFX_TACKLE playsound SFX_ELEVATOR earthquake 79 - applymovement PLAYER, MovementData_0x184a1d - applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a22 + applymovement PLAYER, MovementData_0x108521 + applymovement SPROUTTOWER3F_SILVER, MovementData_0x108526 opentext writetext SproutTowerElderLecturesRivalText waitbutton @@ -40,7 +40,7 @@ SproutTower3FRivalScene: showemote EMOTE_SHOCK, SPROUTTOWER3F_SILVER, 15 turnobject SPROUTTOWER3F_SILVER, DOWN pause 15 - applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a24 + applymovement SPROUTTOWER3F_SILVER, MovementData_0x108528 playmusic MUSIC_RIVAL_ENCOUNTER opentext writetext SproutTowerRivalOnlyCareAboutStrongText @@ -135,18 +135,18 @@ SproutTower3FPotion: SproutTower3FEscapeRope: itemball ESCAPE_ROPE -MovementData_0x184a1d: +MovementData_0x108521: step UP step UP step UP step UP step_end -MovementData_0x184a22: +MovementData_0x108526: step UP step_end -MovementData_0x184a24: +MovementData_0x108528: step RIGHT step DOWN step_end diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index cdceacc3..076e2ec3 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -63,11 +63,11 @@ RocketBaseBossFScript: closetext turnobject PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - applymovement PLAYER, MovementData_0x6d21f + applymovement PLAYER, MovementData_0x114ed7 playmusic MUSIC_ROCKET_ENCOUNTER - applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d224 + applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x114edc turnobject PLAYER, UP - applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d22f + applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x114ee7 opentext writetext RocketBaseBossFThrashText waitbutton @@ -76,23 +76,23 @@ RocketBaseBossFScript: turnobject TEAMROCKETBASEB2F_ROCKET_GIRL, LEFT turnobject PLAYER, LEFT appear TEAMROCKETBASEB2F_DRAGON - applymovement TEAMROCKETBASEB2F_DRAGON, MovementData_0x6d236 - applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d23b - applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d24c + applymovement TEAMROCKETBASEB2F_DRAGON, MovementData_0x114eee + applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x114ef3 + applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x114f04 appear TEAMROCKETBASEB2F_LANCE - applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d244 + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x114efc opentext writetext RocketBaseLanceShareFunText waitbutton closetext turnobject PLAYER, RIGHT - applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d241 + applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x114ef9 opentext writetext RocketBaseBossDontMeddleText waitbutton closetext - applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d24a - applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d248 + applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x114f02 + applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x114f00 winlosstext RocketBaseBossWinText, 0 setlasttalked TEAMROCKETBASEB2F_ROCKET_GIRL loadtrainer EXECUTIVEF, EXECUTIVEF_2 @@ -123,25 +123,25 @@ RocketBaseBossFScript: writetext RocketBaseLancePostBattleText waitbutton closetext - applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d250 + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x114f08 turnobject PLAYER, UP opentext writetext RocketBaseLancePowerOffText waitbutton closetext follow TEAMROCKETBASEB2F_LANCE, PLAYER - applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d254 + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x114f0c stopfollow - applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d258 + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x114f10 opentext writetext RockerBaseLanceElectrodeFaintText waitbutton closetext - applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d267 + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x114f1f disappear TEAMROCKETBASEB2F_LANCE RocketBaseCantLeaveScript: - applymovement PLAYER, MovementData_0x6d271 + applymovement PLAYER, MovementData_0x114f29 end RocketBaseLancesSideScript: @@ -149,7 +149,7 @@ RocketBaseLancesSideScript: writetext RocketBaseLancesSideText waitbutton closetext - applymovement PLAYER, MovementData_0x6d278 + applymovement PLAYER, MovementData_0x114f30 end LanceHealsScript1: @@ -176,12 +176,12 @@ LanceHealsCommon: setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE readvar VAR_FACING ifequal RIGHT, .FacingRight - applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d212 + applymovement TEAMROCKETBASEB2F_LANCE, UnknownText_0x114eca disappear TEAMROCKETBASEB2F_LANCE end .FacingRight: - applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d219 + applymovement TEAMROCKETBASEB2F_LANCE, UnknownText_0x114ed1 disappear TEAMROCKETBASEB2F_LANCE end @@ -233,7 +233,7 @@ RocketElectrode1: iffalse TeamRocketBaseB2FReloadMap reloadmapafterbattle special PlayMapMusic - applymovement PLAYER, MovementData_0x6d28c + applymovement PLAYER, MovementData_0x114f44 sjump RocketBaseElectrodeScript RocketElectrode2: @@ -251,7 +251,7 @@ RocketElectrode2: iffalse TeamRocketBaseB2FReloadMap reloadmapafterbattle special PlayMapMusic - applymovement PLAYER, MovementData_0x6d299 + applymovement PLAYER, MovementData_0x114f51 sjump RocketBaseElectrodeScript RocketElectrode3: @@ -269,7 +269,7 @@ RocketElectrode3: iffalse TeamRocketBaseB2FReloadMap reloadmapafterbattle special PlayMapMusic - applymovement PLAYER, MovementData_0x6d2a4 + applymovement PLAYER, MovementData_0x114f5c sjump RocketBaseElectrodeScript TeamRocketBaseB2FReloadMap: @@ -279,7 +279,7 @@ TeamRocketBaseB2FReloadMap: RocketBaseElectrodeScript: moveobject TEAMROCKETBASEB2F_LANCE, 18, 6 appear TEAMROCKETBASEB2F_LANCE - applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x114f32 turnobject PLAYER, RIGHT opentext writetext RocketBaseLanceElectrodeDoneText @@ -295,7 +295,7 @@ RocketBaseElectrodeScript: waitbutton closetext turnobject PLAYER, DOWN - applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d283 + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x114f3b disappear TEAMROCKETBASEB2F_LANCE setevent EVENT_CLEARED_ROCKET_HIDEOUT clearflag ENGINE_ROCKET_SIGNAL_ON_CH20 @@ -355,7 +355,7 @@ TeamRocketBaseB2FTMThief: TeamRocketBaseB2FHiddenFullHeal: hiddenitem FULL_HEAL, EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL -MovementData_0x6d212: +UnknownText_0x114eca: step RIGHT step RIGHT step RIGHT @@ -364,7 +364,7 @@ MovementData_0x6d212: step RIGHT step_end -MovementData_0x6d219: +UnknownText_0x114ed1: step RIGHT step RIGHT step RIGHT @@ -372,14 +372,14 @@ MovementData_0x6d219: step RIGHT step_end -MovementData_0x6d21f: +MovementData_0x114ed7: step DOWN step DOWN step DOWN turn_head RIGHT step_end -MovementData_0x6d224: +MovementData_0x114edc: big_step LEFT big_step LEFT big_step UP @@ -392,7 +392,7 @@ MovementData_0x6d224: turn_head DOWN step_end -MovementData_0x6d22f: +MovementData_0x114ee7: big_step LEFT big_step LEFT big_step UP @@ -401,14 +401,14 @@ MovementData_0x6d22f: big_step LEFT step_end -MovementData_0x6d236: +MovementData_0x114eee: big_step RIGHT big_step RIGHT big_step RIGHT big_step RIGHT step_end -MovementData_0x6d23b: +MovementData_0x114ef3: fix_facing set_sliding jump_step RIGHT @@ -416,44 +416,44 @@ MovementData_0x6d23b: remove_fixed_facing step_end -MovementData_0x6d241: +MovementData_0x114ef9: slow_step DOWN turn_head LEFT step_end -MovementData_0x6d244: +MovementData_0x114efc: step RIGHT step RIGHT step RIGHT step_end -MovementData_0x6d248: +MovementData_0x114f00: big_step LEFT step_end -MovementData_0x6d24a: +MovementData_0x114f02: big_step LEFT step_end -MovementData_0x6d24c: +MovementData_0x114f04: big_step LEFT big_step UP turn_head LEFT step_end -MovementData_0x6d250: +MovementData_0x114f08: step RIGHT step RIGHT turn_head DOWN step_end -MovementData_0x6d254: +MovementData_0x114f0c: step UP step UP step UP step_end -MovementData_0x6d258: +MovementData_0x114f10: step_sleep 8 step LEFT step LEFT @@ -470,7 +470,7 @@ MovementData_0x6d258: turn_head DOWN step_end -MovementData_0x6d267: +MovementData_0x114f1f: step RIGHT step RIGHT step RIGHT @@ -482,7 +482,7 @@ MovementData_0x6d267: step UP step_end -MovementData_0x6d271: +MovementData_0x114f29: step UP step LEFT step LEFT @@ -491,11 +491,11 @@ MovementData_0x6d271: turn_head UP step_end -MovementData_0x6d278: +MovementData_0x114f30: step LEFT step_end -MovementData_0x6d27a: +MovementData_0x114f32: step DOWN step DOWN step DOWN @@ -506,7 +506,7 @@ MovementData_0x6d27a: step LEFT step_end -MovementData_0x6d283: +MovementData_0x114f3b: step DOWN step DOWN step LEFT @@ -517,7 +517,7 @@ MovementData_0x6d283: step LEFT step_end -MovementData_0x6d28c: +MovementData_0x114f44: step RIGHT step RIGHT step DOWN @@ -532,7 +532,7 @@ MovementData_0x6d28c: step RIGHT step_end -MovementData_0x6d299: +MovementData_0x114f51: step RIGHT step RIGHT step DOWN @@ -545,7 +545,7 @@ MovementData_0x6d299: step RIGHT step_end -MovementData_0x6d2a4: +MovementData_0x114f5c: step RIGHT step RIGHT step DOWN @@ -731,7 +731,7 @@ RocketBaseLanceElectrodeDoneText: done ; unused -UnknownText_0x6d8e6: +UnknownText_0x11559e: text "<PLAYER> received" line "HM06." done diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index f9cd0354..209f0057 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -50,12 +50,12 @@ LanceGetPasswordScript: pause 5 turnobject TEAMROCKETBASEB3F_MOLTRES, RIGHT pause 20 - applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12a + applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x115de0 opentext writetext LanceGetPasswordText waitbutton closetext - applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12c + applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x115de2 disappear TEAMROCKETBASEB3F_LANCE setscene SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER end @@ -84,11 +84,11 @@ TeamRocketBaseB3FRocketScript: jumptextfaceplayer TeamRocketBaseB3FRocketText RocketBaseBossLeft: - applymovement PLAYER, MovementData_0x6e133 + applymovement PLAYER, MovementData_0x115de9 sjump RocketBaseBoss RocketBaseBossRight: - applymovement PLAYER, MovementData_0x6e13a + applymovement PLAYER, MovementData_0x115df0 RocketBaseBoss: pause 30 showemote EMOTE_SHOCK, TEAMROCKETBASEB3F_ROCKET1, 15 @@ -98,7 +98,7 @@ RocketBaseBoss: writetext ExecutiveM4BeforeText waitbutton closetext - applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e142 + applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x115df8 winlosstext ExecutiveM4BeatenText, 0 setlasttalked TEAMROCKETBASEB3F_ROCKET1 loadtrainer EXECUTIVEM, EXECUTIVEM_4 @@ -109,9 +109,9 @@ RocketBaseBoss: writetext ExecutiveM4AfterText waitbutton closetext - applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e144 + applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x115dfa playsound SFX_TACKLE - applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e147 + applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x115dfd disappear TEAMROCKETBASEB3F_ROCKET1 setscene SCENE_TEAMROCKETBASEB3F_NOTHING end @@ -213,11 +213,11 @@ TeamRocketBaseB3FProtein: TeamRocketBaseB3FIceHeal: itemball ICE_HEAL -MovementData_0x6e12a: +MovementData_0x115de0: step RIGHT step_end -MovementData_0x6e12c: +MovementData_0x115de2: step DOWN step LEFT step LEFT @@ -226,7 +226,7 @@ MovementData_0x6e12c: step LEFT step_end -MovementData_0x6e133: +MovementData_0x115de9: step UP step UP step UP @@ -235,7 +235,7 @@ MovementData_0x6e133: turn_head UP step_end -MovementData_0x6e13a: +MovementData_0x115df0: step UP step UP step LEFT @@ -245,16 +245,16 @@ MovementData_0x6e13a: turn_head UP step_end -MovementData_0x6e142: +MovementData_0x115df8: step DOWN step_end -MovementData_0x6e144: +MovementData_0x115dfa: big_step RIGHT big_step RIGHT step_end -MovementData_0x6e147: +MovementData_0x115dfd: fix_facing fast_jump_step LEFT remove_fixed_facing diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 409c3d73..494fdea3 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -23,7 +23,7 @@ VermilionPort_MapScripts: return .LeaveFastShipScript: - applymovement PLAYER, MovementData_0x74ef3 + applymovement PLAYER, MovementData_0x16c65b appear VERMILIONPORT_SAILOR1 setscene SCENE_DEFAULT setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 @@ -48,7 +48,7 @@ VermilionPortSailorAtGangwayScript: playsound SFX_EXIT_BUILDING disappear VERMILIONPORT_SAILOR1 waitsfx - applymovement PLAYER, MovementData_0x74ef1 + applymovement PLAYER, MovementData_0x16c659 playsound SFX_EXIT_BUILDING special FadeOutPalettes waitsfx @@ -101,28 +101,28 @@ VermilionPortWalkUpToShipScript: waitbutton closetext setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 - applymovement PLAYER, MovementData_0x74ef8 + applymovement PLAYER, MovementData_0x16c660 sjump VermilionPortSailorAtGangwayScript .NoTicket: writetext VermilionPortNoTicketText waitbutton closetext - applymovement PLAYER, MovementData_0x74ef5 + applymovement PLAYER, MovementData_0x16c65d end .NextShipWednesday: writetext VermilionPortSailMondayText waitbutton closetext - applymovement PLAYER, MovementData_0x74ef5 + applymovement PLAYER, MovementData_0x16c65d end .NextShipSunday: writetext VermilionPortSailSundayText waitbutton closetext - applymovement PLAYER, MovementData_0x74ef5 + applymovement PLAYER, MovementData_0x16c65d end .skip: @@ -138,7 +138,7 @@ VermilionPortNotRidingMoveAwayScript: writetext VermilionPortComeAgainText waitbutton closetext - applymovement PLAYER, MovementData_0x74ef5 + applymovement PLAYER, MovementData_0x16c65d end VermilionPortSailorScript: @@ -163,7 +163,7 @@ VermilionPortSailorScript: waitbutton closetext setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 - applymovement PLAYER, MovementData_0x74efe + applymovement PLAYER, MovementData_0x16c666 sjump VermilionPortSailorAtGangwayScript .NoTicket: @@ -195,20 +195,20 @@ VermilionPortSuperNerdScript: VermilionPortHiddenIron: hiddenitem IRON, EVENT_VERMILION_PORT_HIDDEN_IRON -MovementData_0x74ef1: +MovementData_0x16c659: step DOWN step_end -MovementData_0x74ef3: +MovementData_0x16c65b: step UP step_end -MovementData_0x74ef5: +MovementData_0x16c65d: step RIGHT turn_head LEFT step_end -MovementData_0x74ef8: +MovementData_0x16c660: step DOWN step DOWN step DOWN @@ -216,7 +216,7 @@ MovementData_0x74ef8: step DOWN step_end -MovementData_0x74efe: +MovementData_0x16c666: step RIGHT step DOWN step DOWN diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index cf1cf5b5..115bc492 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -26,9 +26,9 @@ VictoryRoadRivalLeft: special FadeOutMusic pause 15 appear VICTORYROAD_SILVER - applymovement VICTORYROAD_SILVER, MovementData_0x74539 + applymovement VICTORYROAD_SILVER, MovementData_0x109a61 scall VictoryRoadRivalNext - applymovement VICTORYROAD_SILVER, MovementData_0x7454c + applymovement VICTORYROAD_SILVER, MovementData_0x109a74 disappear VICTORYROAD_SILVER setscene SCENE_FINISHED playmapmusic @@ -40,9 +40,9 @@ VictoryRoadRivalRight: special FadeOutMusic pause 15 appear VICTORYROAD_SILVER - applymovement VICTORYROAD_SILVER, MovementData_0x74542 + applymovement VICTORYROAD_SILVER, MovementData_0x109a6a scall VictoryRoadRivalNext - applymovement VICTORYROAD_SILVER, MovementData_0x74555 + applymovement VICTORYROAD_SILVER, MovementData_0x109a7d disappear VICTORYROAD_SILVER setscene SCENE_FINISHED playmapmusic @@ -115,7 +115,7 @@ VictoryRoadHiddenMaxPotion: VictoryRoadHiddenFullHeal: hiddenitem FULL_HEAL, EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL -MovementData_0x74539: +MovementData_0x109a61: step LEFT step LEFT step LEFT @@ -126,7 +126,7 @@ MovementData_0x74539: step UP step_end -MovementData_0x74542: +MovementData_0x109a6a: step UP step UP step LEFT @@ -138,7 +138,7 @@ MovementData_0x74542: step UP step_end -MovementData_0x7454c: +MovementData_0x109a74: step DOWN step DOWN step RIGHT @@ -149,7 +149,7 @@ MovementData_0x7454c: step RIGHT step_end -MovementData_0x74555: +MovementData_0x109a7d: step DOWN step DOWN step RIGHT |