ref: ad3293595d239ddfc22784d937de7f025999f859
parent: 73bd376cfd3fc39e30d0c06178e8f34f36604f84
author: yenatch <[email protected]>
date: Thu Sep 26 14:40:20 EDT 2013
script commands if_greater_than and if_less_than were swapped
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -9,8 +9,8 @@
dw Script_if_not_equal
dw Script_iffalse
dw Script_iftrue
- dw Script_if_less_than
dw Script_if_greater_than
+ dw Script_if_less_than
dw Script_jumpstd
dw Script_callstd
dw Script_3callasm
@@ -1734,7 +1734,7 @@
jr SkipTwoScriptBytes ; 0x97554 $40
; 0x97556
-Script_if_less_than: ; 0x97556
+Script_if_greater_than: ; 0x97556
; script command 0xa
; parameters:
; byte (SingleByteParam)
@@ -1748,7 +1748,7 @@
jr SkipTwoScriptBytes ; 0x97560 $34
; 0x97562
-Script_if_greater_than: ; 0x97562
+Script_if_less_than: ; 0x97562
; script command 0xb
; parameters:
; byte (SingleByteParam)
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -2298,8 +2298,8 @@
faceplayer
loadfont
special $0059
- if_greater_than $32, UnknownScript_0xbce9a
- if_greater_than $96, UnknownScript_0xbce93
+ if_less_than $32, UnknownScript_0xbce9a
+ if_less_than $96, UnknownScript_0xbce93
3writetext $6c, $492a
closetext
loadmovesprites
@@ -2497,7 +2497,7 @@
checkcode $10
RAM2MEM $0
if_equal $0, .full
- if_greater_than $6, .nearlyfull
+ if_less_than $6, .nearlyfull
3writetext BANK(BillPhoneNotFullText), BillPhoneNotFullText
end
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -11,7 +11,7 @@
loadfont
2writetext UnknownText_0x716ce
checkcode $5
- if_less_than $f8, UnknownScript_0x7167e
+ if_greater_than $f8, UnknownScript_0x7167e
closetext
loadmovesprites
end
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -72,8 +72,8 @@
special $0059
2writetext UnknownText_0x56143
keeptextopen
- if_less_than $95, UnknownScript_0x560ee
- if_less_than $31, UnknownScript_0x560fd
+ if_greater_than $95, UnknownScript_0x560ee
+ if_greater_than $31, UnknownScript_0x560fd
2jump UnknownScript_0x56103
; 0x560ee
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -12,11 +12,11 @@
special $0059
2writetext UnknownText_0x549a3
keeptextopen
- if_less_than $f9, UnknownScript_0x54973
- if_less_than $c7, UnknownScript_0x54979
- if_less_than $95, UnknownScript_0x5497f
- if_less_than $63, UnknownScript_0x54985
- if_less_than $31, UnknownScript_0x5498b
+ if_greater_than $f9, UnknownScript_0x54973
+ if_greater_than $c7, UnknownScript_0x54979
+ if_greater_than $95, UnknownScript_0x5497f
+ if_greater_than $63, UnknownScript_0x54985
+ if_greater_than $31, UnknownScript_0x5498b
2jump UnknownScript_0x54991
; 0x54973
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -175,7 +175,7 @@
checkflag $0060
iftrue UnknownScript_0x5d82f
checkcode $a
- if_greater_than $12, UnknownScript_0x5d893
+ if_less_than $12, UnknownScript_0x5d893
checkflag $005f
iffalse UnknownScript_0x5d80a
checkitem BLUE_CARD
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -12,9 +12,9 @@
UnknownScript_0x1ad318: ; 0x1ad318
checkcode $13
- if_greater_than $5, UnknownScript_0x1ad328
+ if_less_than $5, UnknownScript_0x1ad328
checkcode $12
- if_less_than $d, UnknownScript_0x1ad328
+ if_greater_than $d, UnknownScript_0x1ad328
setflag $0019
return
; 0x1ad328
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -14,7 +14,7 @@
special $0059
2writetext UnknownText_0x7b3c6
keeptextopen
- if_less_than $95, UnknownScript_0x7b3aa
+ if_greater_than $95, UnknownScript_0x7b3aa
2jump UnknownScript_0x7b3bd
; 0x7b3aa
--- a/maps/Route35NationalParkgate.asm
+++ b/maps/Route35NationalParkgate.asm
@@ -105,7 +105,7 @@
yesorno
iffalse UnknownScript_0x6a2a3
checkcode $1
- if_less_than $1, UnknownScript_0x6a271
+ if_greater_than $1, UnknownScript_0x6a271
special $0016
clearevent $0308
UnknownScript_0x6a234: ; 0x6a234
@@ -143,7 +143,7 @@
UnknownScript_0x6a271: ; 0x6a271
checkcode $1
- if_greater_than $6, $627d
+ if_less_than $6, $627d
checkcode $10
if_equal $0, UnknownScript_0x6a2b5
special $005a
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -158,7 +158,7 @@
yesorno
iffalse UnknownScript_0x6ac73
checkcode $1
- if_less_than $1, UnknownScript_0x6ac41
+ if_greater_than $1, UnknownScript_0x6ac41
special $0016
clearevent $0308
UnknownScript_0x6ac10: ; 0x6ac10
@@ -186,7 +186,7 @@
UnknownScript_0x6ac41: ; 0x6ac41
checkcode $1
- if_greater_than $6, UnknownScript_0x6ac4d
+ if_less_than $6, UnknownScript_0x6ac4d
checkcode $10
if_equal $0, UnknownScript_0x6ac85
UnknownScript_0x6ac4d: ; 0x6ac4d
--- a/maps/RuinsofAlphOutside.asm
+++ b/maps/RuinsofAlphOutside.asm
@@ -32,7 +32,7 @@
UnknownScript_0x5801e: ; 0x5801e
checkcode $e
- if_less_than $2, UnknownScript_0x58027
+ if_greater_than $2, UnknownScript_0x58027
2jump UnknownScript_0x5802c
; 0x58027
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -72,8 +72,8 @@
iftrue UnknownScript_0x1aa9f7
checkcode $7
if_equal $10, UnknownScript_0x1aa9ea
- if_less_than $d, UnknownScript_0x1aa9e4
- if_less_than $9, UnknownScript_0x1aa9de
+ if_greater_than $d, UnknownScript_0x1aa9e4
+ if_greater_than $9, UnknownScript_0x1aa9de
2writetext UnknownText_0x1aabc8
closetext
loadmovesprites
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -30,7 +30,7 @@
2writetext UnknownText_0x9ba29
keeptextopen
checkcode $7
- if_less_than $7, UnknownScript_0x9ba19
+ if_greater_than $7, UnknownScript_0x9ba19
2writetext UnknownText_0x9ba5f
closetext
loadmovesprites