Deobfuscate Viridian City

This commit is contained in:
deak311andris 2019-10-07 15:45:45 +02:00
parent 2e45c2946a
commit 1aa28afad4

View file

@ -19,10 +19,10 @@ ViridianCityScript_1900b:
ret nz ret nz
ld a, [wObtainedBadges] ld a, [wObtainedBadges]
cp %01111111 cp %01111111
jr nz, .asm_1901e jr nz, .gymClosed
SetEvent EVENT_VIRIDIAN_GYM_OPEN SetEvent EVENT_VIRIDIAN_GYM_OPEN
ret ret
.asm_1901e .gymClosed
ld a, [wYCoord] ld a, [wYCoord]
cp $8 cp $8
ret nz ret nz
@ -150,11 +150,11 @@ ViridianCityText2:
ld a, [wObtainedBadges] ld a, [wObtainedBadges]
cp %01111111 cp %01111111
ld hl, ViridianCityText_19127 ld hl, ViridianCityText_19127
jr z, .asm_ae9fe jr z, .printAndDone
CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
jr nz, .asm_ae9fe jr nz, .printAndDone
ld hl, ViridianCityText_19122 ld hl, ViridianCityText_19122
.asm_ae9fe .printAndDone
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
@ -173,14 +173,14 @@ ViridianCityText3:
call YesNoChoice call YesNoChoice
ld a, [wCurrentMenuItem] ld a, [wCurrentMenuItem]
and a and a
jr nz, .asm_6dfea jr nz, .no
ld hl, ViridianCityText_19157 ld hl, ViridianCityText_19157
call PrintText call PrintText
jr .asm_d611f jr .done
.asm_6dfea .no
ld hl, ViridianCityText_19152 ld hl, ViridianCityText_19152
call PrintText call PrintText
.asm_d611f .done
jp TextScriptEnd jp TextScriptEnd
ViridianCityText_1914d: ViridianCityText_1914d:
@ -198,14 +198,14 @@ ViridianCityText_19157:
ViridianCityText4: ViridianCityText4:
TX_ASM TX_ASM
CheckEvent EVENT_GOT_POKEDEX CheckEvent EVENT_GOT_POKEDEX
jr nz, .asm_83894 jr nz, .gotPokedex
ld hl, ViridianCityText_19175 ld hl, ViridianCityText_19175
call PrintText call PrintText
jr .asm_700a6 jr .done
.asm_83894 .gotPokedex
ld hl, ViridianCityText_1917a ld hl, ViridianCityText_1917a
call PrintText call PrintText
.asm_700a6 .done
jp TextScriptEnd jp TextScriptEnd
ViridianCityText_19175: ViridianCityText_19175:
@ -232,7 +232,7 @@ ViridianCityText_19191:
ViridianCityText6: ViridianCityText6:
TX_ASM TX_ASM
CheckEvent EVENT_GOT_TM42 CheckEvent EVENT_GOT_TM42
jr nz, .asm_4e5a0 jr nz, .gotTm42
ld hl, ViridianCityText_191ca ld hl, ViridianCityText_191ca
call PrintText call PrintText
lb bc, TM_42, 1 lb bc, TM_42, 1
@ -241,15 +241,15 @@ ViridianCityText6:
ld hl, ReceivedTM42Text ld hl, ReceivedTM42Text
call PrintText call PrintText
SetEvent EVENT_GOT_TM42 SetEvent EVENT_GOT_TM42
jr .asm_3c73c jr .done
.BagFull .BagFull
ld hl, TM42NoRoomText ld hl, TM42NoRoomText
call PrintText call PrintText
jr .asm_3c73c jr .done
.asm_4e5a0 .gotTm42
ld hl, TM42Explanation ld hl, TM42Explanation
call PrintText call PrintText
.asm_3c73c .done
jp TextScriptEnd jp TextScriptEnd
ViridianCityText_191ca: ViridianCityText_191ca:
@ -278,16 +278,16 @@ ViridianCityText7:
call YesNoChoice call YesNoChoice
ld a, [wCurrentMenuItem] ld a, [wCurrentMenuItem]
and a and a
jr z, .asm_42f68 jr z, .hurry
ld hl, ViridianCityText_1920f ld hl, ViridianCityText_1920f
call PrintText call PrintText
ld a, $1 ld a, $1
ld [wViridianCityCurScript], a ld [wViridianCityCurScript], a
jr .asm_2413a jr .done
.asm_42f68 .hurry
ld hl, ViridianCityText_19214 ld hl, ViridianCityText_19214
call PrintText call PrintText
.asm_2413a .done
jp TextScriptEnd jp TextScriptEnd
ViridianCityText_1920a: ViridianCityText_1920a: