diff --git a/asm/include/ov100_021D0D80.inc b/asm/include/ov100_021D0D80.inc index cd19766d83..bf37027984 100644 --- a/asm/include/ov100_021D0D80.inc +++ b/asm/include/ov100_021D0D80.inc @@ -56,7 +56,7 @@ .public sub_0201FFE8 .public sub_020203AC .public sub_020203B8 -.public sub_02022974 +.public GF_AssertFail .public sub_02024220 .public sub_020242C4 .public sub_02027B50 diff --git a/asm/include/ov101_021D0D80.inc b/asm/include/ov101_021D0D80.inc index d42363ddeb..5543a36308 100644 --- a/asm/include/ov101_021D0D80.inc +++ b/asm/include/ov101_021D0D80.inc @@ -63,7 +63,7 @@ .public sub_0201FF0C .public sub_0201FF68 .public sub_0201FF74 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_0202CF70 diff --git a/asm/include/ov101_021D1A28.inc b/asm/include/ov101_021D1A28.inc index 1232dd880e..c92c85ed7f 100644 --- a/asm/include/ov101_021D1A28.inc +++ b/asm/include/ov101_021D1A28.inc @@ -8,7 +8,7 @@ .public sub_02019E2C .public sub_0201C3C0 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_02071330 .public sub_0207136C .public sub_02071598 diff --git a/asm/include/ov101_021D59AC.inc b/asm/include/ov101_021D59AC.inc index 34745eeb8c..00a08014be 100644 --- a/asm/include/ov101_021D59AC.inc +++ b/asm/include/ov101_021D59AC.inc @@ -19,7 +19,7 @@ .public sub_02021E2C .public sub_02021E50 .public sub_02021FD0 -.public sub_02022974 +.public GF_AssertFail .public sub_02071330 .public sub_0207136C .public sub_02071598 diff --git a/asm/include/ov101_021D7E48.inc b/asm/include/ov101_021D7E48.inc index d05134bdbe..df3b02c8d2 100644 --- a/asm/include/ov101_021D7E48.inc +++ b/asm/include/ov101_021D7E48.inc @@ -26,4 +26,4 @@ .public sub_02021BD4 .public sub_02021D28 .public sub_02021D2C -.public sub_02022974 +.public GF_AssertFail diff --git a/asm/include/ov104_0222DCE0.inc b/asm/include/ov104_0222DCE0.inc index 23a95a051c..1fba857731 100644 --- a/asm/include/ov104_0222DCE0.inc +++ b/asm/include/ov104_0222DCE0.inc @@ -14,7 +14,7 @@ .public sub_02021E2C .public sub_02021E50 .public sub_02021E74 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_02023DF0 .public sub_02025E38 diff --git a/asm/include/ov104_0222E63C.inc b/asm/include/ov104_0222E63C.inc index ad6e2c5c56..85ea9c1889 100644 --- a/asm/include/ov104_0222E63C.inc +++ b/asm/include/ov104_0222E63C.inc @@ -5,7 +5,7 @@ .public sub_0200B3F0 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_0209B974 diff --git a/asm/include/ov104_0222E930.inc b/asm/include/ov104_0222E930.inc index 92ad37dde0..90bd2216a5 100644 --- a/asm/include/ov104_0222E930.inc +++ b/asm/include/ov104_0222E930.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public ov104_0222E9F8 .public ov104_0222EA14 .public ov104_0222EA48 diff --git a/asm/include/ov104_0222EA90.inc b/asm/include/ov104_0222EA90.inc index 7694518f55..90c9279e03 100644 --- a/asm/include/ov104_0222EA90.inc +++ b/asm/include/ov104_0222EA90.inc @@ -2,7 +2,7 @@ .public sub_020181C4 .public sub_02019060 .public sub_0201FF0C -.public sub_02022974 +.public GF_AssertFail .public G2x_SetBlendAlpha_ .public ov104_0223C164 .public ov104_0223C23C diff --git a/asm/include/ov104_0222ECE8.inc b/asm/include/ov104_0222ECE8.inc index efbae89124..98573a8f1f 100644 --- a/asm/include/ov104_0222ECE8.inc +++ b/asm/include/ov104_0222ECE8.inc @@ -1,5 +1,5 @@ .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_0203041C .public sub_020305B8 diff --git a/asm/include/ov104_0222FBE4.inc b/asm/include/ov104_0222FBE4.inc index 75c2d88933..c771a7c615 100644 --- a/asm/include/ov104_0222FBE4.inc +++ b/asm/include/ov104_0222FBE4.inc @@ -52,7 +52,7 @@ .public sub_0201D2E8 .public sub_0201D470 .public sub_0201D724 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_0202440C .public sub_020246E0 diff --git a/asm/include/ov104_02231F74.inc b/asm/include/ov104_02231F74.inc index 8138eac214..23dfa7b0a1 100644 --- a/asm/include/ov104_02231F74.inc +++ b/asm/include/ov104_02231F74.inc @@ -59,7 +59,7 @@ .public sub_02021F24 .public sub_02021F98 .public sub_02021F9C -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023810 diff --git a/asm/include/ov104_022339B4.inc b/asm/include/ov104_022339B4.inc index eabdcbe5ad..ce0358ba4e 100644 --- a/asm/include/ov104_022339B4.inc +++ b/asm/include/ov104_022339B4.inc @@ -1,7 +1,7 @@ .public sub_02018144 .public sub_020181C4 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_0202CD88 .public sub_0202CF28 .public sub_0202FF4C diff --git a/asm/include/ov104_022361B4.inc b/asm/include/ov104_022361B4.inc index c11ae209ec..f52f8737ec 100644 --- a/asm/include/ov104_022361B4.inc +++ b/asm/include/ov104_022361B4.inc @@ -14,7 +14,7 @@ .public sub_0201A954 .public sub_0201ADA4 .public sub_0201D738 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025E38 diff --git a/asm/include/ov104_02237DD8.inc b/asm/include/ov104_02237DD8.inc index 7b9b5b3e43..63338a0cc6 100644 --- a/asm/include/ov104_02237DD8.inc +++ b/asm/include/ov104_02237DD8.inc @@ -11,7 +11,7 @@ .public sub_0201FF0C .public sub_02021CAC .public sub_02021CC8 -.public sub_02022974 +.public GF_AssertFail .public sub_02030494 .public sub_020304A0 .public sub_020304B8 diff --git a/asm/include/ov104_02239130.inc b/asm/include/ov104_02239130.inc index 57687645a7..725f971bd7 100644 --- a/asm/include/ov104_02239130.inc +++ b/asm/include/ov104_02239130.inc @@ -1,5 +1,5 @@ .public sub_02004550 -.public sub_02022974 +.public GF_AssertFail .public sub_0202440C .public sub_0202CD88 .public sub_0202CF70 diff --git a/asm/include/ov104_02239C58.inc b/asm/include/ov104_02239C58.inc index 99a120c83f..1c9997e264 100644 --- a/asm/include/ov104_02239C58.inc +++ b/asm/include/ov104_02239C58.inc @@ -1,7 +1,7 @@ .public sub_02018144 .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025E44 .public sub_02028430 diff --git a/asm/include/ov104_0223A0C4.inc b/asm/include/ov104_0223A0C4.inc index 2f082e20b7..e967ac9260 100644 --- a/asm/include/ov104_0223A0C4.inc +++ b/asm/include/ov104_0223A0C4.inc @@ -1,6 +1,6 @@ .public sub_0200B274 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02025FCC .public sub_0202D5E8 .public sub_0202D63C diff --git a/asm/include/ov104_0223A7F4.inc b/asm/include/ov104_0223A7F4.inc index 6258a6d670..a308a9ac5a 100644 --- a/asm/include/ov104_0223A7F4.inc +++ b/asm/include/ov104_0223A7F4.inc @@ -1,6 +1,6 @@ .public sub_020181C4 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E80 .public sub_02032EE8 .public sub_0203608C diff --git a/asm/include/ov104_0223B6F4.inc b/asm/include/ov104_0223B6F4.inc index 47655869c8..3baf64a613 100644 --- a/asm/include/ov104_0223B6F4.inc +++ b/asm/include/ov104_0223B6F4.inc @@ -2,7 +2,7 @@ .public sub_020198C0 .public sub_0201C3C0 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025E80 .public sub_02030698 diff --git a/asm/include/ov104_0223BCBC.inc b/asm/include/ov104_0223BCBC.inc index 8dfdc1fbd0..635820dfdc 100644 --- a/asm/include/ov104_0223BCBC.inc +++ b/asm/include/ov104_0223BCBC.inc @@ -1,6 +1,6 @@ .public sub_020181C4 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025E80 .public sub_02032EE8 diff --git a/asm/include/ov104_0223C2D4.inc b/asm/include/ov104_0223C2D4.inc index ff8873ff2d..28deb188ca 100644 --- a/asm/include/ov104_0223C2D4.inc +++ b/asm/include/ov104_0223C2D4.inc @@ -80,7 +80,7 @@ .public sub_0201FF68 .public sub_0201FF74 .public sub_0201FFD0 -.public sub_02022974 +.public GF_AssertFail .public sub_020241BC .public sub_02024220 .public sub_020242C4 diff --git a/asm/include/ov104_0223D5D0.inc b/asm/include/ov104_0223D5D0.inc index edec65a19b..1bcb0e14a0 100644 --- a/asm/include/ov104_0223D5D0.inc +++ b/asm/include/ov104_0223D5D0.inc @@ -15,7 +15,7 @@ .public sub_02018144 .public sub_020181C4 .public sub_020206BC -.public sub_02022974 +.public GF_AssertFail .public sub_020241B4 .public MI_CpuFill8 .public ov104_0223D708 diff --git a/asm/include/ov104_0223D768.inc b/asm/include/ov104_0223D768.inc index fec17747cf..7b4caa9063 100644 --- a/asm/include/ov104_0223D768.inc +++ b/asm/include/ov104_0223D768.inc @@ -9,4 +9,4 @@ .public sub_0200D0A0 .public sub_0200D0F4 .public sub_0200D324 -.public sub_02022974 +.public GF_AssertFail diff --git a/asm/include/ov104_0223D860.inc b/asm/include/ov104_0223D860.inc index 85a8664c79..14fa767aa3 100644 --- a/asm/include/ov104_0223D860.inc +++ b/asm/include/ov104_0223D860.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_0209B974 .public sub_0209B9D0 .public MI_CpuFill8 diff --git a/asm/include/ov104_0223DC7C.inc b/asm/include/ov104_0223DC7C.inc index d0acdd264e..bd2ec8f08a 100644 --- a/asm/include/ov104_0223DC7C.inc +++ b/asm/include/ov104_0223DC7C.inc @@ -57,7 +57,7 @@ .public sub_02021CAC .public sub_02021CF8 .public sub_02021D6C -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public FX_Div .public FX_ModS32 diff --git a/asm/include/ov104_0223E894.inc b/asm/include/ov104_0223E894.inc index 1c6f060cae..c85d2d5db2 100644 --- a/asm/include/ov104_0223E894.inc +++ b/asm/include/ov104_0223E894.inc @@ -16,7 +16,7 @@ .public sub_02018144 .public sub_020181C4 .public sub_0201AE78 -.public sub_02022974 +.public GF_AssertFail .public GXx_SetMasterBrightness_ .public memset .public _s32_div_f diff --git a/asm/include/ov105_02241AE0.inc b/asm/include/ov105_02241AE0.inc index 138592f5c2..95723abe5d 100644 --- a/asm/include/ov105_02241AE0.inc +++ b/asm/include/ov105_02241AE0.inc @@ -80,7 +80,7 @@ .public sub_0201FF74 .public sub_0201FFD0 .public sub_020219F8 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020237E8 diff --git a/asm/include/ov107_02241AE0.inc b/asm/include/ov107_02241AE0.inc index 3658635a6b..3dad18620e 100644 --- a/asm/include/ov107_02241AE0.inc +++ b/asm/include/ov107_02241AE0.inc @@ -89,7 +89,7 @@ .public sub_0201FF74 .public sub_0201FFD0 .public sub_020219F8 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023D28 diff --git a/asm/include/ov107_02245EB0.inc b/asm/include/ov107_02245EB0.inc index 222ec550d5..478b196d1e 100644 --- a/asm/include/ov107_02245EB0.inc +++ b/asm/include/ov107_02245EB0.inc @@ -85,7 +85,7 @@ .public sub_0201FF74 .public sub_0201FFD0 .public sub_020219F8 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023D28 diff --git a/asm/include/ov107_02249B1C.inc b/asm/include/ov107_02249B1C.inc index 156f98f348..323fd02fa8 100644 --- a/asm/include/ov107_02249B1C.inc +++ b/asm/include/ov107_02249B1C.inc @@ -10,7 +10,7 @@ .public sub_02021E80 .public sub_02021F24 .public sub_02021FD0 -.public sub_02022974 +.public GF_AssertFail .public sub_02079FC4 .public ov104_0222E1D8 .public ov104_0222E204 diff --git a/asm/include/ov108_02241AE0.inc b/asm/include/ov108_02241AE0.inc index 756c5fe0f8..7c1d8f3669 100644 --- a/asm/include/ov108_02241AE0.inc +++ b/asm/include/ov108_02241AE0.inc @@ -50,7 +50,7 @@ .public sub_0201FF74 .public sub_020219F8 .public sub_020226DC -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025E38 diff --git a/asm/include/ov109_021D0D80.inc b/asm/include/ov109_021D0D80.inc index a6dc2ccd28..dace80f1a2 100644 --- a/asm/include/ov109_021D0D80.inc +++ b/asm/include/ov109_021D0D80.inc @@ -105,7 +105,7 @@ .public sub_020203EC .public sub_02020680 .public sub_020206D0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020241B4 diff --git a/asm/include/ov109_021D3D50.inc b/asm/include/ov109_021D3D50.inc index 1245415ab6..d0351e95d4 100644 --- a/asm/include/ov109_021D3D50.inc +++ b/asm/include/ov109_021D3D50.inc @@ -94,7 +94,7 @@ .public sub_02021CAC .public sub_02021CC8 .public sub_02021D6C -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025EF4 diff --git a/asm/include/ov10_0221F800.inc b/asm/include/ov10_0221F800.inc index f26dcbc981..456ff85379 100644 --- a/asm/include/ov10_0221F800.inc +++ b/asm/include/ov10_0221F800.inc @@ -120,7 +120,7 @@ .public sub_0201FF68 .public sub_020206BC .public sub_02021E2C -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023DF0 diff --git a/asm/include/ov111_021D0D80.inc b/asm/include/ov111_021D0D80.inc index f72ecd81a0..e8054ceed2 100644 --- a/asm/include/ov111_021D0D80.inc +++ b/asm/include/ov111_021D0D80.inc @@ -83,7 +83,7 @@ .public sub_02022664 .public sub_0202278C .public sub_020227A4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025E44 diff --git a/asm/include/ov111_021D2F80.inc b/asm/include/ov111_021D2F80.inc index 459b810e6f..5ae9421fd9 100644 --- a/asm/include/ov111_021D2F80.inc +++ b/asm/include/ov111_021D2F80.inc @@ -29,7 +29,7 @@ .public sub_02021CC8 .public sub_02021CE4 .public sub_02021D6C -.public sub_02022974 +.public GF_AssertFail .public NNS_G2dInitOamManagerModule .public ov111_021D304C .public ov111_021D30D8 diff --git a/asm/include/ov112_0225C700.inc b/asm/include/ov112_0225C700.inc index 0fcf8782ed..0ef64dd1d1 100644 --- a/asm/include/ov112_0225C700.inc +++ b/asm/include/ov112_0225C700.inc @@ -69,7 +69,7 @@ .public sub_0201FFE8 .public sub_02021964 .public sub_020219F8 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023810 diff --git a/asm/include/ov113_0225C700.inc b/asm/include/ov113_0225C700.inc index 4798da1568..d4f995bedb 100644 --- a/asm/include/ov113_0225C700.inc +++ b/asm/include/ov113_0225C700.inc @@ -142,7 +142,7 @@ .public sub_02020A88 .public sub_02020A90 .public sub_02021F98 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020241B4 diff --git a/asm/include/ov113_0225E368.inc b/asm/include/ov113_0225E368.inc index 1b7a9f253c..f1c615ad60 100644 --- a/asm/include/ov113_0225E368.inc +++ b/asm/include/ov113_0225E368.inc @@ -28,7 +28,7 @@ .public sub_02020ABC .public sub_02020ACC .public sub_02020ADC -.public sub_02022974 +.public GF_AssertFail .public sub_02075BFC .public NNS_G2dGetUnpackedCharacterData .public NNS_G3dTexGetRequiredSize diff --git a/asm/include/ov113_02260620.inc b/asm/include/ov113_02260620.inc index 9158365d4a..7f0778876f 100644 --- a/asm/include/ov113_02260620.inc +++ b/asm/include/ov113_02260620.inc @@ -7,7 +7,7 @@ .public sub_0201ADA4 .public sub_0201D78C .public sub_02022664 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025E6C diff --git a/asm/include/ov114_0225C700.inc b/asm/include/ov114_0225C700.inc index 983919c845..164e73f372 100644 --- a/asm/include/ov114_0225C700.inc +++ b/asm/include/ov114_0225C700.inc @@ -125,7 +125,7 @@ .public sub_02021EF0 .public sub_02021F24 .public sub_02021FD0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025E38 diff --git a/asm/include/ov115_02260440.inc b/asm/include/ov115_02260440.inc index 78969e0f41..467069c6a4 100644 --- a/asm/include/ov115_02260440.inc +++ b/asm/include/ov115_02260440.inc @@ -14,7 +14,7 @@ .public sub_020181C4 .public sub_0201DBEC .public sub_0201DC3C -.public sub_02022974 +.public GF_AssertFail .public sub_02032E64 .public sub_020359DC .public sub_02035E18 diff --git a/asm/include/ov115_02260CEC.inc b/asm/include/ov115_02260CEC.inc index 18a36c49cf..f778a64ca7 100644 --- a/asm/include/ov115_02260CEC.inc +++ b/asm/include/ov115_02260CEC.inc @@ -135,7 +135,7 @@ .public sub_02021E90 .public sub_02021F58 .public sub_02021F74 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020238A0 diff --git a/asm/include/ov116_022604C4.inc b/asm/include/ov116_022604C4.inc index a7c562556f..5283d12439 100644 --- a/asm/include/ov116_022604C4.inc +++ b/asm/include/ov116_022604C4.inc @@ -71,7 +71,7 @@ .public sub_0201FFE8 .public sub_020203AC .public sub_020203B8 -.public sub_02022974 +.public GF_AssertFail .public sub_02024220 .public sub_020242C4 .public sub_02032E64 diff --git a/asm/include/ov116_02261870.inc b/asm/include/ov116_02261870.inc index 0010af89f1..5ba000e805 100644 --- a/asm/include/ov116_02261870.inc +++ b/asm/include/ov116_02261870.inc @@ -50,7 +50,7 @@ .public sub_020203EC .public sub_020206BC .public sub_02020784 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_020241B4 .public sub_020241BC diff --git a/asm/include/ov117_02260668.inc b/asm/include/ov117_02260668.inc index e7f39a6868..b85dcf8a08 100644 --- a/asm/include/ov117_02260668.inc +++ b/asm/include/ov117_02260668.inc @@ -126,7 +126,7 @@ .public sub_020206BC .public sub_020206D0 .public sub_02020854 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020241B4 diff --git a/asm/include/ov117_022626B0_arm.inc b/asm/include/ov117_022626B0_arm.inc index 07eafe56f4..8d046e3dd9 100644 --- a/asm/include/ov117_022626B0_arm.inc +++ b/asm/include/ov117_022626B0_arm.inc @@ -16,7 +16,7 @@ .public sub_0200D364 .public sub_0200D3F4 .public sub_0200D500 -.public sub_02022974 +.public GF_AssertFail .public NNS_G3dGeBufferOP_N .public FX_Atan2Idx .public _ll_sdiv diff --git a/asm/include/ov117_022626B0_thumb.inc b/asm/include/ov117_022626B0_thumb.inc index 69dbccdb7a..22e7d50faf 100644 --- a/asm/include/ov117_022626B0_thumb.inc +++ b/asm/include/ov117_022626B0_thumb.inc @@ -5,7 +5,7 @@ .public sub_020181C4 .public sub_020182F0 .public sub_0201CBCC -.public sub_02022974 +.public GF_AssertFail .public NNS_G3dGeFlushBuffer .public NNS_G3dGeBufferOP_N .public NNS_G3dGetTex diff --git a/asm/include/ov117_02263AF0.inc b/asm/include/ov117_02263AF0.inc index 790ebae0a8..fed482a86b 100644 --- a/asm/include/ov117_02263AF0.inc +++ b/asm/include/ov117_02263AF0.inc @@ -54,7 +54,7 @@ .public sub_0201D7E0 .public sub_0201ED94 .public sub_0201EE28 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_0203608C .public FX_Inv diff --git a/asm/include/ov117_022665FC.inc b/asm/include/ov117_022665FC.inc index 76dad3fd53..43d810fde5 100644 --- a/asm/include/ov117_022665FC.inc +++ b/asm/include/ov117_022665FC.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_02032798 .public sub_020359DC .public ov117_02262044 diff --git a/asm/include/ov118_021D0D80.inc b/asm/include/ov118_021D0D80.inc index a8b1d10dc0..dc779e16f2 100644 --- a/asm/include/ov118_021D0D80.inc +++ b/asm/include/ov118_021D0D80.inc @@ -22,7 +22,7 @@ .public sub_0201D724 .public sub_0201FF0C .public sub_020206BC -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_020241B4 .public sub_020241BC diff --git a/asm/include/ov119_021D0D80.inc b/asm/include/ov119_021D0D80.inc index 0963802fad..4c29ac21eb 100644 --- a/asm/include/ov119_021D0D80.inc +++ b/asm/include/ov119_021D0D80.inc @@ -79,7 +79,7 @@ .public sub_0201FF68 .public sub_0201FFD0 .public sub_020206BC -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020241B4 diff --git a/asm/include/ov119_021D191C.inc b/asm/include/ov119_021D191C.inc index 739175fbe4..22899c2e55 100644 --- a/asm/include/ov119_021D191C.inc +++ b/asm/include/ov119_021D191C.inc @@ -22,7 +22,7 @@ .public sub_0201FAB4 .public sub_0201FF0C .public sub_02021F9C -.public sub_02022974 +.public GF_AssertFail .public sub_02074470 .public ov119_021D1028 .public ov119_021D1048 diff --git a/asm/include/ov12_0221FC20.inc b/asm/include/ov12_0221FC20.inc index 1bc747672c..b91b07a9a4 100644 --- a/asm/include/ov12_0221FC20.inc +++ b/asm/include/ov12_0221FC20.inc @@ -61,7 +61,7 @@ .public sub_0201FAB4 .public sub_02021F98 .public sub_02021F9C -.public sub_02022974 +.public GF_AssertFail .public sub_02077D3C .public G2x_SetBlendAlpha_ .public MI_CpuFill8 diff --git a/asm/include/ov12_02225864.inc b/asm/include/ov12_02225864.inc index 5086e07bd4..eb077657f1 100644 --- a/asm/include/ov12_02225864.inc +++ b/asm/include/ov12_02225864.inc @@ -27,7 +27,7 @@ .public sub_020181C4 .public sub_0201FAB4 .public sub_02021F9C -.public sub_02022974 +.public GF_AssertFail .public FX_Div .public FX_Sqrt .public FX_Atan2Idx diff --git a/asm/include/ov12_022269C0.inc b/asm/include/ov12_022269C0.inc index 219a586175..e10ae321d3 100644 --- a/asm/include/ov12_022269C0.inc +++ b/asm/include/ov12_022269C0.inc @@ -7,7 +7,7 @@ .public sub_0200DA58 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public ov12_022201CC .public ov12_02220204 .public ov12_02220220 diff --git a/asm/include/ov12_02226B84.inc b/asm/include/ov12_02226B84.inc index 6428558227..121b9eea07 100644 --- a/asm/include/ov12_02226B84.inc +++ b/asm/include/ov12_02226B84.inc @@ -37,7 +37,7 @@ .public sub_0201D2E8 .public sub_0201FAB4 .public sub_02021F9C -.public sub_02022974 +.public GF_AssertFail .public G2x_SetBlendAlpha_ .public _f_sub .public _s32_div_f diff --git a/asm/include/ov12_0222AC70.inc b/asm/include/ov12_0222AC70.inc index 0c0f4d17a6..5a2e61dee6 100644 --- a/asm/include/ov12_0222AC70.inc +++ b/asm/include/ov12_0222AC70.inc @@ -29,7 +29,7 @@ .public sub_02019184 .public sub_0201FAB4 .public sub_02021F9C -.public sub_02022974 +.public GF_AssertFail .public _f_itof .public _f_mul .public ov12_0221FDD4 diff --git a/asm/include/ov12_0222D6B0.inc b/asm/include/ov12_0222D6B0.inc index 69e57a7314..f1a1d0d360 100644 --- a/asm/include/ov12_0222D6B0.inc +++ b/asm/include/ov12_0222D6B0.inc @@ -22,7 +22,7 @@ .public sub_020181C4 .public sub_02019120 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public _f_add .public _f_sub .public _s32_div_f diff --git a/asm/include/ov12_0222F700.inc b/asm/include/ov12_0222F700.inc index 74cbcd9e84..de8043f558 100644 --- a/asm/include/ov12_0222F700.inc +++ b/asm/include/ov12_0222F700.inc @@ -38,7 +38,7 @@ .public sub_02019EBC .public sub_0201CED4 .public sub_02021FD0 -.public sub_02022974 +.public GF_AssertFail .public G2x_SetBlendAlpha_ .public MIi_CpuClear32 .public memset diff --git a/asm/include/ov12_02235254.inc b/asm/include/ov12_02235254.inc index 49439d6426..8f8ff6210e 100644 --- a/asm/include/ov12_02235254.inc +++ b/asm/include/ov12_02235254.inc @@ -5,7 +5,7 @@ .public sub_02014790 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public G2x_SetBlendAlpha_ .public memset .public ov12_0221FDD4 diff --git a/asm/include/ov12_02235E94.inc b/asm/include/ov12_02235E94.inc index 790d8e833b..5cb523bd2d 100644 --- a/asm/include/ov12_02235E94.inc +++ b/asm/include/ov12_02235E94.inc @@ -40,7 +40,7 @@ .public sub_02018144 .public sub_020181C4 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_0202CA64 .public sub_0202CA7C .public sub_0202CA80 diff --git a/asm/include/ov12_02237EFC.inc b/asm/include/ov12_02237EFC.inc index b130e3d576..164c43ed21 100644 --- a/asm/include/ov12_02237EFC.inc +++ b/asm/include/ov12_02237EFC.inc @@ -6,7 +6,7 @@ .public sub_02014788 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public ov12_02220474 .public ov12_022237F0 .public ov12_02223894 diff --git a/asm/include/ov14_0221FC20.inc b/asm/include/ov14_0221FC20.inc index 2cc2082bc9..71c6029d6a 100644 --- a/asm/include/ov14_0221FC20.inc +++ b/asm/include/ov14_0221FC20.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_02074470 .public sub_020759F0 .public sub_020787CC diff --git a/asm/include/ov16_0223B140.inc b/asm/include/ov16_0223B140.inc index 856778ff98..58274ff4d5 100644 --- a/asm/include/ov16_0223B140.inc +++ b/asm/include/ov16_0223B140.inc @@ -105,7 +105,7 @@ .public sub_0201FF0C .public sub_0201FF74 .public sub_0201FFD0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020241BC diff --git a/asm/include/ov16_0223DF00.inc b/asm/include/ov16_0223DF00.inc index 8f64a04389..dfe49c6445 100644 --- a/asm/include/ov16_0223DF00.inc +++ b/asm/include/ov16_0223DF00.inc @@ -30,7 +30,7 @@ .public sub_0201ADA4 .public sub_0201D738 .public sub_02021F98 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_02025F30 .public sub_02025F58 diff --git a/asm/include/ov16_022405FC.inc b/asm/include/ov16_022405FC.inc index 1e39460821..ec5fa6f224 100644 --- a/asm/include/ov16_022405FC.inc +++ b/asm/include/ov16_022405FC.inc @@ -64,7 +64,7 @@ .public sub_0201EEB8 .public sub_02021F24 .public sub_02022798 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_02025F94 .public sub_02025FB8 diff --git a/asm/include/ov16_0224B940.inc b/asm/include/ov16_0224B940.inc index 655e4e3a5e..32b17c95fc 100644 --- a/asm/include/ov16_0224B940.inc +++ b/asm/include/ov16_0224B940.inc @@ -2,7 +2,7 @@ .public sub_0200F2AC .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02025F58 .public sub_020360DC .public sub_02074470 diff --git a/asm/include/ov16_0225177C.inc b/asm/include/ov16_0225177C.inc index 7a262e3d45..aa8eda3807 100644 --- a/asm/include/ov16_0225177C.inc +++ b/asm/include/ov16_0225177C.inc @@ -2,7 +2,7 @@ .public sub_02006AA4 .public sub_02006B58 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023D28 .public sub_02025EF0 .public sub_02025F20 diff --git a/asm/include/ov16_0225CBB8.inc b/asm/include/ov16_0225CBB8.inc index 606a41497f..85f6e37b19 100644 --- a/asm/include/ov16_0225CBB8.inc +++ b/asm/include/ov16_0225CBB8.inc @@ -56,7 +56,7 @@ .public sub_0201ACCC .public sub_0201ADA4 .public sub_0201D724 -.public sub_02022974 +.public GF_AssertFail .public sub_02025FCC .public sub_02073C74 .public sub_02074470 diff --git a/asm/include/ov16_0226485C.inc b/asm/include/ov16_0226485C.inc index 4a2cea6587..7afddbcc00 100644 --- a/asm/include/ov16_0226485C.inc +++ b/asm/include/ov16_0226485C.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_0202F250 .public sub_02035E18 .public sub_0203608C diff --git a/asm/include/ov16_02266F1C.inc b/asm/include/ov16_02266F1C.inc index 143a5069b7..a85e914674 100644 --- a/asm/include/ov16_02266F1C.inc +++ b/asm/include/ov16_02266F1C.inc @@ -34,7 +34,7 @@ .public sub_02021CC8 .public sub_02021E50 .public sub_02021F98 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02076B10 diff --git a/asm/include/ov16_02268520.inc b/asm/include/ov16_02268520.inc index a75f91b26d..eb9bec18a8 100644 --- a/asm/include/ov16_02268520.inc +++ b/asm/include/ov16_02268520.inc @@ -13,7 +13,7 @@ .public sub_0200D0F4 .public sub_0200D324 .public sub_0200D3F4 -.public sub_02022974 +.public GF_AssertFail .public MIi_CpuClearFast .public ov16_0223E010 .public ov16_0223E018 diff --git a/asm/include/ov16_0226871C.inc b/asm/include/ov16_0226871C.inc index 18b92b16fb..5329c11ebd 100644 --- a/asm/include/ov16_0226871C.inc +++ b/asm/include/ov16_0226871C.inc @@ -88,7 +88,7 @@ .public sub_02021F24 .public sub_02021F98 .public sub_02022664 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02076B10 diff --git a/asm/include/ov16_0226D094.inc b/asm/include/ov16_0226D094.inc index a56e2ac466..53a1ca34b2 100644 --- a/asm/include/ov16_0226D094.inc +++ b/asm/include/ov16_0226D094.inc @@ -22,7 +22,7 @@ .public sub_020181C4 .public sub_02021D6C .public sub_02021E50 -.public sub_02022974 +.public GF_AssertFail .public G2x_SetBlendAlpha_ .public MI_CpuFill8 .public ov16_0223F9F0 diff --git a/asm/include/ov16_0226E148.inc b/asm/include/ov16_0226E148.inc index dd3b28112c..886558fd50 100644 --- a/asm/include/ov16_0226E148.inc +++ b/asm/include/ov16_0226E148.inc @@ -6,7 +6,7 @@ .public sub_02018144 .public sub_020181C4 .public sub_0201CED0 -.public sub_02022974 +.public GF_AssertFail .public MI_CpuFill8 .public ov16_0223E02C .public ov16_0223F720 diff --git a/asm/include/ov17_0223B140.inc b/asm/include/ov17_0223B140.inc index 6b80859106..92322efee3 100644 --- a/asm/include/ov17_0223B140.inc +++ b/asm/include/ov17_0223B140.inc @@ -83,7 +83,7 @@ .public sub_0201FF68 .public sub_0201FF74 .public sub_0201FFD0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02038A1C diff --git a/asm/include/ov17_0223CB1C.inc b/asm/include/ov17_0223CB1C.inc index 38721d18ae..550137e256 100644 --- a/asm/include/ov17_0223CB1C.inc +++ b/asm/include/ov17_0223CB1C.inc @@ -83,7 +83,7 @@ .public sub_0201FF68 .public sub_0201FF74 .public sub_0201FFD0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02027B50 diff --git a/asm/include/ov17_0223DAD0.inc b/asm/include/ov17_0223DAD0.inc index 22ff252f2d..579893cbe1 100644 --- a/asm/include/ov17_0223DAD0.inc +++ b/asm/include/ov17_0223DAD0.inc @@ -95,7 +95,7 @@ .public sub_0201FF74 .public sub_0201FFD0 .public sub_020206BC -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02027B50 diff --git a/asm/include/ov17_0223F118.inc b/asm/include/ov17_0223F118.inc index d0d03a4675..5e7feef7c0 100644 --- a/asm/include/ov17_0223F118.inc +++ b/asm/include/ov17_0223F118.inc @@ -39,7 +39,7 @@ .public sub_0201ED94 .public sub_0201EE28 .public sub_0201FF0C -.public sub_02022974 +.public GF_AssertFail .public sub_02024220 .public sub_020242C4 .public sub_02074470 diff --git a/asm/include/ov17_0223F7E4.inc b/asm/include/ov17_0223F7E4.inc index 986f75fa5b..efbe194d8c 100644 --- a/asm/include/ov17_0223F7E4.inc +++ b/asm/include/ov17_0223F7E4.inc @@ -46,7 +46,7 @@ .public sub_0201ED94 .public sub_0201EE28 .public sub_02022664 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_02074470 .public sub_020790C4 diff --git a/asm/include/ov17_022413D8.inc b/asm/include/ov17_022413D8.inc index 30807e2540..fa9919b784 100644 --- a/asm/include/ov17_022413D8.inc +++ b/asm/include/ov17_022413D8.inc @@ -50,7 +50,7 @@ .public sub_0201D1D4 .public sub_0201D724 .public sub_0201D738 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02027AC0 diff --git a/asm/include/ov17_02246ECC.inc b/asm/include/ov17_02246ECC.inc index 695aeb6143..d618e1607d 100644 --- a/asm/include/ov17_02246ECC.inc +++ b/asm/include/ov17_02246ECC.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02074470 .public sub_020790C4 .public sub_02094E98 diff --git a/asm/include/ov17_022476F8.inc b/asm/include/ov17_022476F8.inc index 48fa9fa211..01a5568cc8 100644 --- a/asm/include/ov17_022476F8.inc +++ b/asm/include/ov17_022476F8.inc @@ -24,7 +24,7 @@ .public sub_0201D2B8 .public sub_0201D724 .public sub_0201D738 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_02027AC0 .public sub_0207697C diff --git a/asm/include/ov17_02247A48.inc b/asm/include/ov17_02247A48.inc index df713c84e0..5374129f5e 100644 --- a/asm/include/ov17_02247A48.inc +++ b/asm/include/ov17_02247A48.inc @@ -14,7 +14,7 @@ .public sub_020181C4 .public sub_02019FE4 .public sub_0201C3C0 -.public sub_02022974 +.public GF_AssertFail .public sub_02074470 .public sub_020765B8 .public sub_02077D3C diff --git a/asm/include/ov17_022492DC.inc b/asm/include/ov17_022492DC.inc index 03c11cc275..0e06784ea0 100644 --- a/asm/include/ov17_022492DC.inc +++ b/asm/include/ov17_022492DC.inc @@ -41,7 +41,7 @@ .public sub_0201ED94 .public sub_0201EE28 .public sub_02022664 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_02095848 .public sub_020958C4 diff --git a/asm/include/ov17_0224A0FC.inc b/asm/include/ov17_0224A0FC.inc index 54d9acf01b..09a3e75889 100644 --- a/asm/include/ov17_0224A0FC.inc +++ b/asm/include/ov17_0224A0FC.inc @@ -48,7 +48,7 @@ .public sub_0201D724 .public sub_0201D738 .public sub_02021CC8 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_02027AC0 .public sub_020765B8 diff --git a/asm/include/ov17_0224CFB8.inc b/asm/include/ov17_0224CFB8.inc index f38a96762f..7ed6cce930 100644 --- a/asm/include/ov17_0224CFB8.inc +++ b/asm/include/ov17_0224CFB8.inc @@ -14,7 +14,7 @@ .public sub_020181C4 .public sub_02019FE4 .public sub_0201C3C0 -.public sub_02022974 +.public GF_AssertFail .public sub_020360D0 .public sub_020765B8 .public sub_02094EDC diff --git a/asm/include/ov17_0224E930.inc b/asm/include/ov17_0224E930.inc index cb9fdda6cf..88401b028a 100644 --- a/asm/include/ov17_0224E930.inc +++ b/asm/include/ov17_0224E930.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_02094EA0 .public MI_CpuFill8 .public _s32_div_f diff --git a/asm/include/ov17_0224F080.inc b/asm/include/ov17_0224F080.inc index cd3b9a8dee..099b19f3d8 100644 --- a/asm/include/ov17_0224F080.inc +++ b/asm/include/ov17_0224F080.inc @@ -6,7 +6,7 @@ .public sub_0200D090 .public sub_0200D0A0 .public sub_0200D0F4 -.public sub_02022974 +.public GF_AssertFail .public ov17_0224F080 .public ov17_0224F098 .public ov17_0224F09C diff --git a/asm/include/ov17_0224F18C.inc b/asm/include/ov17_0224F18C.inc index ab447a4d6d..9c1fcf72ff 100644 --- a/asm/include/ov17_0224F18C.inc +++ b/asm/include/ov17_0224F18C.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_0203597C .public MIi_CpuCopy32 .public MI_CpuFill8 diff --git a/asm/include/ov17_0224F4D4.inc b/asm/include/ov17_0224F4D4.inc index 2242d44126..eaf1a518a9 100644 --- a/asm/include/ov17_0224F4D4.inc +++ b/asm/include/ov17_0224F4D4.inc @@ -75,7 +75,7 @@ .public sub_0201FF68 .public sub_0201FF74 .public sub_0201FFD0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02038A1C diff --git a/asm/include/ov17_02250744.inc b/asm/include/ov17_02250744.inc index 60737120df..6729c5c2de 100644 --- a/asm/include/ov17_02250744.inc +++ b/asm/include/ov17_02250744.inc @@ -41,7 +41,7 @@ .public sub_0201D738 .public sub_0201D78C .public sub_02021F24 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02027AC0 diff --git a/asm/include/ov17_02251D6C.inc b/asm/include/ov17_02251D6C.inc index 821f0fcc3c..5199f6ea34 100644 --- a/asm/include/ov17_02251D6C.inc +++ b/asm/include/ov17_02251D6C.inc @@ -19,7 +19,7 @@ .public sub_0201A954 .public sub_0201ADA4 .public sub_0201C3C0 -.public sub_02022974 +.public GF_AssertFail .public sub_02074470 .public sub_02077D3C .public GXx_SetMasterBrightness_ diff --git a/asm/include/ov17_02252CEC.inc b/asm/include/ov17_02252CEC.inc index 169f8cbc96..c252ae3190 100644 --- a/asm/include/ov17_02252CEC.inc +++ b/asm/include/ov17_02252CEC.inc @@ -1,3 +1,3 @@ -.public sub_02022974 +.public GF_AssertFail .public MI_CpuCopy8 .public ov17_0224B20C diff --git a/asm/include/ov19_021D0D80.inc b/asm/include/ov19_021D0D80.inc index 08d54e199d..cd28cadd90 100644 --- a/asm/include/ov19_021D0D80.inc +++ b/asm/include/ov19_021D0D80.inc @@ -20,7 +20,7 @@ .public sub_0201807C .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020237E8 diff --git a/asm/include/ov19_021D61B0.inc b/asm/include/ov19_021D61B0.inc index 8d919361c0..3db830c140 100644 --- a/asm/include/ov19_021D61B0.inc +++ b/asm/include/ov19_021D61B0.inc @@ -42,7 +42,7 @@ .public sub_02021CC8 .public sub_02021CE4 .public sub_02021F58 -.public sub_02022974 +.public GF_AssertFail .public NNS_G2dSetupSoftwareSpriteCamera .public NNS_G2dInitOamManagerModule .public NNS_G2dInitImagePaletteProxy diff --git a/asm/include/ov19_021DA270.inc b/asm/include/ov19_021DA270.inc index 001365028c..fc7187b0e0 100644 --- a/asm/include/ov19_021DA270.inc +++ b/asm/include/ov19_021DA270.inc @@ -13,7 +13,7 @@ .public sub_02021F7C .public sub_02021FD0 .public sub_02021FE0 -.public sub_02022974 +.public GF_AssertFail .public sub_02073D20 .public sub_02073D48 .public sub_02074570 diff --git a/asm/include/ov19_021DA92C.inc b/asm/include/ov19_021DA92C.inc index 322ec4c93d..6e8f37a9ad 100644 --- a/asm/include/ov19_021DA92C.inc +++ b/asm/include/ov19_021DA92C.inc @@ -34,7 +34,7 @@ .public sub_02021D28 .public sub_02021D34 .public sub_02021E90 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_02075F0C .public sub_02075FB4 diff --git a/asm/include/ov19_021DB8E4.inc b/asm/include/ov19_021DB8E4.inc index bf36ac3c0f..794684a51d 100644 --- a/asm/include/ov19_021DB8E4.inc +++ b/asm/include/ov19_021DB8E4.inc @@ -34,7 +34,7 @@ .public sub_02021C50 .public sub_02021CAC .public sub_02021E90 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02073D20 diff --git a/asm/include/ov19_021DC5F0.inc b/asm/include/ov19_021DC5F0.inc index 61f133eef8..21c2b66dc3 100644 --- a/asm/include/ov19_021DC5F0.inc +++ b/asm/include/ov19_021DC5F0.inc @@ -9,7 +9,7 @@ .public sub_02021CAC .public sub_02021D28 .public sub_02021E80 -.public sub_02022974 +.public GF_AssertFail .public sub_0207A0F8 .public sub_0207A0FC .public ov19_021D3B18 diff --git a/asm/include/ov19_021DCF88.inc b/asm/include/ov19_021DCF88.inc index d18334aba6..1c2640e7d4 100644 --- a/asm/include/ov19_021DCF88.inc +++ b/asm/include/ov19_021DCF88.inc @@ -28,7 +28,7 @@ .public sub_02021D0C .public sub_02021D6C .public sub_02021FD0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02079AF4 diff --git a/asm/include/ov19_021DF964.inc b/asm/include/ov19_021DF964.inc index 47a868781d..17430a0c7b 100644 --- a/asm/include/ov19_021DF964.inc +++ b/asm/include/ov19_021DF964.inc @@ -1,5 +1,5 @@ .public sub_02005748 -.public sub_02022974 +.public GF_AssertFail .public sub_02079CFC .public sub_02079D20 .public ov19_021D5E08 diff --git a/asm/include/ov20_021D2098.inc b/asm/include/ov20_021D2098.inc index a31418502a..9c6bbbc102 100644 --- a/asm/include/ov20_021D2098.inc +++ b/asm/include/ov20_021D2098.inc @@ -32,7 +32,7 @@ .public sub_02021B90 .public sub_02021CC8 .public sub_02021CE4 -.public sub_02022974 +.public GF_AssertFail .public NNS_G2dInitOamManagerModule .public NNS_G2dInitImageProxy .public NNS_G2dInitImagePaletteProxy diff --git a/asm/include/ov20_021D3A54.inc b/asm/include/ov20_021D3A54.inc index 38b11b1936..1c57a2b03b 100644 --- a/asm/include/ov20_021D3A54.inc +++ b/asm/include/ov20_021D3A54.inc @@ -19,7 +19,7 @@ .public sub_02021C50 .public sub_02021CAC .public sub_02021D6C -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02099CA0 diff --git a/asm/include/ov20_021D5044.inc b/asm/include/ov20_021D5044.inc index a242b1bd80..6293117036 100644 --- a/asm/include/ov20_021D5044.inc +++ b/asm/include/ov20_021D5044.inc @@ -1,2 +1,2 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_02023D8C diff --git a/asm/include/ov21_021D0D80.inc b/asm/include/ov21_021D0D80.inc index 22bf155ccc..9e216eb808 100644 --- a/asm/include/ov21_021D0D80.inc +++ b/asm/include/ov21_021D0D80.inc @@ -47,7 +47,7 @@ .public sub_02021E2C .public sub_02021E50 .public sub_02021E74 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020238A0 diff --git a/asm/include/ov21_021D1FA4.inc b/asm/include/ov21_021D1FA4.inc index cda64e2d36..1f8b6a4e50 100644 --- a/asm/include/ov21_021D1FA4.inc +++ b/asm/include/ov21_021D1FA4.inc @@ -63,7 +63,7 @@ .public sub_02021E80 .public sub_02021F58 .public sub_02021FE0 -.public sub_02022974 +.public GF_AssertFail .public sub_02075DAC .public sub_02075FB4 .public sub_02076648 diff --git a/asm/include/ov21_021D3208.inc b/asm/include/ov21_021D3208.inc index 9c91bb3528..af4c266caf 100644 --- a/asm/include/ov21_021D3208.inc +++ b/asm/include/ov21_021D3208.inc @@ -1,7 +1,7 @@ .public sub_02007068 .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_02025F04 .public sub_02025F30 diff --git a/asm/include/ov21_021D3FE0.inc b/asm/include/ov21_021D3FE0.inc index 83501b7293..f538f214c5 100644 --- a/asm/include/ov21_021D3FE0.inc +++ b/asm/include/ov21_021D3FE0.inc @@ -1,5 +1,5 @@ .public sub_02018144 -.public sub_02022974 +.public GF_AssertFail .public memset .public ov21_021D41A8 .public ov21_021D41D8 diff --git a/asm/include/ov21_021D423C.inc b/asm/include/ov21_021D423C.inc index 2d958f0694..680376e43c 100644 --- a/asm/include/ov21_021D423C.inc +++ b/asm/include/ov21_021D423C.inc @@ -1,5 +1,5 @@ .public sub_02018144 -.public sub_02022974 +.public GF_AssertFail .public ov21_021D42EC .public ov21_021D42FC .public ov21_021D4334 diff --git a/asm/include/ov21_021D4340.inc b/asm/include/ov21_021D4340.inc index 33f4a353a7..17ec33e9ff 100644 --- a/asm/include/ov21_021D4340.inc +++ b/asm/include/ov21_021D4340.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public memset .public ov21_021D12EC .public ov21_021D1300 diff --git a/asm/include/ov21_021D4C0C.inc b/asm/include/ov21_021D4C0C.inc index 091cbe002d..635f3bdfae 100644 --- a/asm/include/ov21_021D4C0C.inc +++ b/asm/include/ov21_021D4C0C.inc @@ -17,7 +17,7 @@ .public sub_0201D78C .public sub_0201ED94 .public sub_0201EE28 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public memset .public ov21_021D4CB8 diff --git a/asm/include/ov21_021D4EE4.inc b/asm/include/ov21_021D4EE4.inc index 40a970e2ac..724ab43fb1 100644 --- a/asm/include/ov21_021D4EE4.inc +++ b/asm/include/ov21_021D4EE4.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public _s32_div_f .public ov21_021D5040 .public ov21_021D5090 diff --git a/asm/include/ov21_021D517C.inc b/asm/include/ov21_021D517C.inc index a13b4ca4f3..72998d500d 100644 --- a/asm/include/ov21_021D517C.inc +++ b/asm/include/ov21_021D517C.inc @@ -1,5 +1,5 @@ .public sub_0201ADDC -.public sub_02022974 +.public GF_AssertFail .public _s32_div_f .public ov21_021D5248 .public ov21_021D52A0 diff --git a/asm/include/ov21_021D5600.inc b/asm/include/ov21_021D5600.inc index 5f5366e023..937fd18991 100644 --- a/asm/include/ov21_021D5600.inc +++ b/asm/include/ov21_021D5600.inc @@ -2,7 +2,7 @@ .public sub_0200B190 .public sub_0200B1B8 .public sub_0200B32C -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020986CC diff --git a/asm/include/ov21_021D57B4.inc b/asm/include/ov21_021D57B4.inc index 06af5f817d..76b190b1ab 100644 --- a/asm/include/ov21_021D57B4.inc +++ b/asm/include/ov21_021D57B4.inc @@ -2,7 +2,7 @@ .public sub_020181C4 .public sub_02021C50 .public sub_02021D6C -.public sub_02022974 +.public GF_AssertFail .public _u32_div_f .public ov21_021D58C0 .public ov21_021D59D8 diff --git a/asm/include/ov21_021D5AEC.inc b/asm/include/ov21_021D5AEC.inc index 9eb0db7ac9..585506a715 100644 --- a/asm/include/ov21_021D5AEC.inc +++ b/asm/include/ov21_021D5AEC.inc @@ -44,7 +44,7 @@ .public sub_02021F58 .public sub_02021F74 .public sub_02021FE0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020238A0 diff --git a/asm/include/ov21_021D76B0.inc b/asm/include/ov21_021D76B0.inc index ab1e3b6977..da0e9cecb4 100644 --- a/asm/include/ov21_021D76B0.inc +++ b/asm/include/ov21_021D76B0.inc @@ -32,7 +32,7 @@ .public sub_02021BD4 .public sub_02021CAC .public sub_02021D6C -.public sub_02022974 +.public GF_AssertFail .public sub_02023FCC .public sub_02024034 .public sub_0202404C diff --git a/asm/include/ov21_021D85B0.inc b/asm/include/ov21_021D85B0.inc index 0113e81e53..7a1314f99a 100644 --- a/asm/include/ov21_021D85B0.inc +++ b/asm/include/ov21_021D85B0.inc @@ -33,7 +33,7 @@ .public sub_02021CF8 .public sub_02021D6C .public sub_02021E80 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_02023C5C .public memset diff --git a/asm/include/ov21_021D94BC.inc b/asm/include/ov21_021D94BC.inc index 3477fb9d8c..e95c153d20 100644 --- a/asm/include/ov21_021D94BC.inc +++ b/asm/include/ov21_021D94BC.inc @@ -25,7 +25,7 @@ .public sub_02021CAC .public sub_02021D6C .public sub_02021FE0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023FCC .public sub_02024034 .public sub_0202404C diff --git a/asm/include/ov21_021DC9BC.inc b/asm/include/ov21_021DC9BC.inc index 25cc8bcea7..2c6bb06f27 100644 --- a/asm/include/ov21_021DC9BC.inc +++ b/asm/include/ov21_021DC9BC.inc @@ -30,7 +30,7 @@ .public sub_02021CAC .public sub_02021D6C .public sub_02021FE0 -.public sub_02022974 +.public GF_AssertFail .public FX_Div .public G2x_SetBlendAlpha_ .public memset diff --git a/asm/include/ov21_021DDD2C.inc b/asm/include/ov21_021DDD2C.inc index f3932ff9f7..e3df010805 100644 --- a/asm/include/ov21_021DDD2C.inc +++ b/asm/include/ov21_021DDD2C.inc @@ -17,7 +17,7 @@ .public sub_02021C50 .public sub_02021D6C .public sub_02021FE0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023FCC .public sub_02024034 .public sub_0202404C diff --git a/asm/include/ov21_021DE668.inc b/asm/include/ov21_021DE668.inc index ca4a058459..a60568ebf6 100644 --- a/asm/include/ov21_021DE668.inc +++ b/asm/include/ov21_021DE668.inc @@ -33,7 +33,7 @@ .public sub_02021BD4 .public sub_02021D6C .public sub_02021FE0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020759CC diff --git a/asm/include/ov21_021DF734.inc b/asm/include/ov21_021DF734.inc index 5aaabad065..85c5718cdb 100644 --- a/asm/include/ov21_021DF734.inc +++ b/asm/include/ov21_021DF734.inc @@ -26,7 +26,7 @@ .public sub_02021D6C .public sub_02021E80 .public sub_02021FE0 -.public sub_02022974 +.public GF_AssertFail .public sub_020759F0 .public memset .public ov21_021D138C diff --git a/asm/include/ov21_021E0C68.inc b/asm/include/ov21_021E0C68.inc index bcd8b55566..31e165275e 100644 --- a/asm/include/ov21_021E0C68.inc +++ b/asm/include/ov21_021E0C68.inc @@ -28,7 +28,7 @@ .public sub_02021BD4 .public sub_02021D6C .public sub_02021FE0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public memset diff --git a/asm/include/ov21_021E1924.inc b/asm/include/ov21_021E1924.inc index a4f3a8c7c4..314a94777c 100644 --- a/asm/include/ov21_021E1924.inc +++ b/asm/include/ov21_021E1924.inc @@ -23,7 +23,7 @@ .public sub_02021D6C .public sub_02021E74 .public sub_02021FE0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023FCC .public sub_02024034 .public sub_0202404C diff --git a/asm/include/ov21_021E29DC.inc b/asm/include/ov21_021E29DC.inc index ea4a171be7..b30dd0f9a4 100644 --- a/asm/include/ov21_021E29DC.inc +++ b/asm/include/ov21_021E29DC.inc @@ -25,7 +25,7 @@ .public sub_02021BD4 .public sub_02021CAC .public sub_02021D6C -.public sub_02022974 +.public GF_AssertFail .public sub_02023FCC .public sub_02024034 .public sub_0202404C diff --git a/asm/include/ov21_021E3FFC.inc b/asm/include/ov21_021E3FFC.inc index 004ade3205..8e5b9568e5 100644 --- a/asm/include/ov21_021E3FFC.inc +++ b/asm/include/ov21_021E3FFC.inc @@ -37,7 +37,7 @@ .public sub_02021D34 .public sub_02021D6C .public sub_02021FE0 -.public sub_02022974 +.public GF_AssertFail .public FX_Div .public memset .public _ull_mul diff --git a/asm/include/ov21_021E4CA4.inc b/asm/include/ov21_021E4CA4.inc index f8816b8d5a..d4980c3d54 100644 --- a/asm/include/ov21_021E4CA4.inc +++ b/asm/include/ov21_021E4CA4.inc @@ -53,7 +53,7 @@ .public sub_02021E74 .public sub_02021FE0 .public sub_02022734 -.public sub_02022974 +.public GF_AssertFail .public sub_02023FCC .public sub_02024034 .public sub_0202404C diff --git a/asm/include/ov21_021E6014.inc b/asm/include/ov21_021E6014.inc index 7e32c7fe37..d8f3b2064c 100644 --- a/asm/include/ov21_021E6014.inc +++ b/asm/include/ov21_021E6014.inc @@ -30,7 +30,7 @@ .public sub_02021C80 .public sub_02021D6C .public sub_02021FE0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02098848 diff --git a/asm/include/ov21_021E68F4.inc b/asm/include/ov21_021E68F4.inc index ebb75f370a..752b340e92 100644 --- a/asm/include/ov21_021E68F4.inc +++ b/asm/include/ov21_021E68F4.inc @@ -22,7 +22,7 @@ .public sub_02021D6C .public sub_02021E74 .public sub_02021FE0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023FCC .public sub_02024034 .public sub_0202404C diff --git a/asm/include/ov21_021E737C.inc b/asm/include/ov21_021E737C.inc index 0b7a59182c..650fdb623c 100644 --- a/asm/include/ov21_021E737C.inc +++ b/asm/include/ov21_021E737C.inc @@ -46,7 +46,7 @@ .public sub_02021D6C .public sub_02021E80 .public sub_02021EC4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02079D8C diff --git a/asm/include/ov21_021E8484.inc b/asm/include/ov21_021E8484.inc index a79dcac077..f54bf31667 100644 --- a/asm/include/ov21_021E8484.inc +++ b/asm/include/ov21_021E8484.inc @@ -22,7 +22,7 @@ .public sub_02021D6C .public sub_02021E74 .public sub_02021FE0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023FCC .public sub_02024034 .public sub_0202404C diff --git a/asm/include/ov21_021E8D48.inc b/asm/include/ov21_021E8D48.inc index 2f02045726..26d5704f4d 100644 --- a/asm/include/ov21_021E8D48.inc +++ b/asm/include/ov21_021E8D48.inc @@ -63,7 +63,7 @@ .public sub_02021BD4 .public sub_02021D6C .public sub_02022014 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02074470 diff --git a/asm/include/ov22_02254DE0.inc b/asm/include/ov22_02254DE0.inc index ad5b1b81f3..8014164edd 100644 --- a/asm/include/ov22_02254DE0.inc +++ b/asm/include/ov22_02254DE0.inc @@ -9,7 +9,7 @@ .public sub_020181C4 .public sub_02022734 .public sub_02022830 -.public sub_02022974 +.public GF_AssertFail .public memset .public ov22_02254E44 .public ov22_02254F00 diff --git a/asm/include/ov22_02255094.inc b/asm/include/ov22_02255094.inc index beb300fea9..df52ea7a61 100644 --- a/asm/include/ov22_02255094.inc +++ b/asm/include/ov22_02255094.inc @@ -54,7 +54,7 @@ .public sub_02021964 .public sub_020219F8 .public sub_02021B90 -.public sub_02022974 +.public GF_AssertFail .public sub_0202298C .public sub_020229D8 .public sub_02022A1C diff --git a/asm/include/ov22_02255D44.inc b/asm/include/ov22_02255D44.inc index 747b7f9ce0..cd63a26326 100644 --- a/asm/include/ov22_02255D44.inc +++ b/asm/include/ov22_02255D44.inc @@ -57,7 +57,7 @@ .public sub_0201E530 .public sub_0201FF0C .public sub_020219A4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025F04 diff --git a/asm/include/ov22_022578F4.inc b/asm/include/ov22_022578F4.inc index 9099f2dcf1..7a7c14da3b 100644 --- a/asm/include/ov22_022578F4.inc +++ b/asm/include/ov22_022578F4.inc @@ -3,7 +3,7 @@ .public sub_0201529C .public sub_02022734 .public sub_02022830 -.public sub_02022974 +.public GF_AssertFail .public memset .public ov22_02254E20 .public ov22_02254F6C diff --git a/asm/include/ov22_02257F50.inc b/asm/include/ov22_02257F50.inc index 107b1619c4..d2fd28fcba 100644 --- a/asm/include/ov22_02257F50.inc +++ b/asm/include/ov22_02257F50.inc @@ -6,7 +6,7 @@ .public sub_0201D35C .public sub_02022734 .public sub_02022830 -.public sub_02022974 +.public GF_AssertFail .public memset .public _s32_div_f .public _u32_div_f diff --git a/asm/include/ov22_0225894C.inc b/asm/include/ov22_0225894C.inc index a351ce7d7c..1b87861ac1 100644 --- a/asm/include/ov22_0225894C.inc +++ b/asm/include/ov22_0225894C.inc @@ -1,3 +1,3 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_02029D94 .public sub_02029DD4 diff --git a/asm/include/ov22_022589E0.inc b/asm/include/ov22_022589E0.inc index c564bc3502..93afd55c9e 100644 --- a/asm/include/ov22_022589E0.inc +++ b/asm/include/ov22_022589E0.inc @@ -5,7 +5,7 @@ .public sub_020181C4 .public sub_0201CED0 .public sub_0201D35C -.public sub_02022974 +.public GF_AssertFail .public memset .public _s32_div_f .public _u32_div_f diff --git a/asm/include/ov22_02259484.inc b/asm/include/ov22_02259484.inc index 217a824b04..0e6c08d29c 100644 --- a/asm/include/ov22_02259484.inc +++ b/asm/include/ov22_02259484.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public memset .public ov22_02259510 .public ov22_02259530 diff --git a/asm/include/ov22_02259C58.inc b/asm/include/ov22_02259C58.inc index ac7217b2c0..8ef529a48e 100644 --- a/asm/include/ov22_02259C58.inc +++ b/asm/include/ov22_02259C58.inc @@ -30,7 +30,7 @@ .public sub_02021C50 .public sub_02021D28 .public sub_02021E50 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_02023FCC .public sub_02024034 diff --git a/asm/include/ov22_0225A428.inc b/asm/include/ov22_0225A428.inc index e6724226e9..b36b7b51fa 100644 --- a/asm/include/ov22_0225A428.inc +++ b/asm/include/ov22_0225A428.inc @@ -32,7 +32,7 @@ .public sub_02021CF8 .public sub_02021D6C .public sub_02021EC4 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_02027AC0 .public sub_02027B50 diff --git a/asm/include/ov22_0225B660.inc b/asm/include/ov22_0225B660.inc index f5a289f885..7a84cff7f0 100644 --- a/asm/include/ov22_0225B660.inc +++ b/asm/include/ov22_0225B660.inc @@ -46,7 +46,7 @@ .public sub_02021C50 .public sub_02021D6C .public sub_02021E80 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020241B4 diff --git a/asm/include/ov23_0223E140.inc b/asm/include/ov23_0223E140.inc index 4b8e456cfa..8de2de41fd 100644 --- a/asm/include/ov23_0223E140.inc +++ b/asm/include/ov23_0223E140.inc @@ -73,7 +73,7 @@ .public sub_02021CAC .public sub_02021CC8 .public sub_02021D6C -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025F20 .public sub_02027474 diff --git a/asm/include/ov23_022416A8.inc b/asm/include/ov23_022416A8.inc index f62c453e31..fbdb4f127b 100644 --- a/asm/include/ov23_022416A8.inc +++ b/asm/include/ov23_022416A8.inc @@ -9,7 +9,7 @@ .public sub_0200DA58 .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02029088 diff --git a/asm/include/ov23_02241F74.inc b/asm/include/ov23_02241F74.inc index 622ecfff8f..5158b31095 100644 --- a/asm/include/ov23_02241F74.inc +++ b/asm/include/ov23_02241F74.inc @@ -10,7 +10,7 @@ .public sub_0200DD0C .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023810 diff --git a/asm/include/ov23_0224340C.inc b/asm/include/ov23_0224340C.inc index a36cacba4c..e9b5e9e20d 100644 --- a/asm/include/ov23_0224340C.inc +++ b/asm/include/ov23_0224340C.inc @@ -55,7 +55,7 @@ .public sub_02021E80 .public sub_02021F58 .public sub_02021FE0 -.public sub_02022974 +.public GF_AssertFail .public sub_02028EF8 .public sub_02028F40 .public sub_02028F5C diff --git a/asm/include/ov23_02248F1C.inc b/asm/include/ov23_02248F1C.inc index c84321f445..fa2abf5780 100644 --- a/asm/include/ov23_02248F1C.inc +++ b/asm/include/ov23_02248F1C.inc @@ -40,7 +40,7 @@ .public sub_02021CAC .public sub_02021CC8 .public sub_02021D6C -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023810 diff --git a/asm/include/ov23_02249918.inc b/asm/include/ov23_02249918.inc index 229b7f0f63..89fdad15fb 100644 --- a/asm/include/ov23_02249918.inc +++ b/asm/include/ov23_02249918.inc @@ -1,3 +1,3 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_020361BC .public ov23_02249978 diff --git a/asm/include/ov23_0224A1D0.inc b/asm/include/ov23_0224A1D0.inc index 059d0912c3..89c6f645ee 100644 --- a/asm/include/ov23_0224A1D0.inc +++ b/asm/include/ov23_0224A1D0.inc @@ -5,7 +5,7 @@ .public sub_0200DA58 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023C3C diff --git a/asm/include/ov23_0224B05C.inc b/asm/include/ov23_0224B05C.inc index 3b6b101d86..16c7bc8653 100644 --- a/asm/include/ov23_0224B05C.inc +++ b/asm/include/ov23_0224B05C.inc @@ -18,7 +18,7 @@ .public sub_020181C4 .public sub_0201A778 .public sub_0201A8D4 -.public sub_02022974 +.public GF_AssertFail .public sub_02028554 .public sub_02028B34 .public sub_020292C0 diff --git a/asm/include/ov23_0224DC40.inc b/asm/include/ov23_0224DC40.inc index 2fc61f6dd7..67cbe059a4 100644 --- a/asm/include/ov23_0224DC40.inc +++ b/asm/include/ov23_0224DC40.inc @@ -22,7 +22,7 @@ .public sub_0201A954 .public sub_0201ACF4 .public sub_0201D35C -.public sub_02022974 +.public GF_AssertFail .public sub_02025F30 .public sub_02028810 .public sub_0202952C diff --git a/asm/include/ov23_0224F294.inc b/asm/include/ov23_0224F294.inc index cc37350d3a..c97514c4b1 100644 --- a/asm/include/ov23_0224F294.inc +++ b/asm/include/ov23_0224F294.inc @@ -48,7 +48,7 @@ .public sub_02021E2C .public sub_02021EC4 .public sub_02021FD0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025E38 diff --git a/asm/include/ov23_022521F0.inc b/asm/include/ov23_022521F0.inc index 9a0b30ffd8..947f8124f6 100644 --- a/asm/include/ov23_022521F0.inc +++ b/asm/include/ov23_022521F0.inc @@ -29,7 +29,7 @@ .public sub_0201A9A4 .public sub_0201ADA4 .public sub_0201D738 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02027474 diff --git a/asm/include/ov23_02253598.inc b/asm/include/ov23_02253598.inc index dfb570206d..2f57e484a8 100644 --- a/asm/include/ov23_02253598.inc +++ b/asm/include/ov23_02253598.inc @@ -19,7 +19,7 @@ .public sub_0201ACF4 .public sub_0201ADA4 .public sub_0201D738 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025F24 diff --git a/asm/include/ov23_02253D40.inc b/asm/include/ov23_02253D40.inc index 2aab115e4c..ebb930644c 100644 --- a/asm/include/ov23_02253D40.inc +++ b/asm/include/ov23_02253D40.inc @@ -30,7 +30,7 @@ .public sub_0201D724 .public sub_0201D730 .public sub_0201D738 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public MI_CpuFill8 diff --git a/asm/include/ov23_02254A14.inc b/asm/include/ov23_02254A14.inc index 48f2ac1a7e..8a63ba310f 100644 --- a/asm/include/ov23_02254A14.inc +++ b/asm/include/ov23_02254A14.inc @@ -7,7 +7,7 @@ .public sub_0201CA24 .public sub_0201CA74 .public sub_0201D724 -.public sub_02022974 +.public GF_AssertFail .public sub_020289A0 .public sub_020289B8 .public sub_02028ACC diff --git a/asm/include/ov25_02253CE0.inc b/asm/include/ov25_02253CE0.inc index 1f8c87715a..a0e28ed796 100644 --- a/asm/include/ov25_02253CE0.inc +++ b/asm/include/ov25_02253CE0.inc @@ -13,7 +13,7 @@ .public sub_0201E530 .public sub_020227A4 .public sub_020227C0 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025F30 .public sub_0203D158 diff --git a/asm/include/ov25_02255090.inc b/asm/include/ov25_02255090.inc index 58495d5387..46180e6a7c 100644 --- a/asm/include/ov25_02255090.inc +++ b/asm/include/ov25_02255090.inc @@ -7,7 +7,7 @@ .public sub_02018144 .public sub_020181C4 .public sub_020198C0 -.public sub_02022974 +.public GF_AssertFail .public sub_02079FD0 .public NNS_G2dGetUnpackedCharacterData .public GXS_LoadOBJPltt diff --git a/asm/include/ov25_02255ACC.inc b/asm/include/ov25_02255ACC.inc index b83a61b924..11794f2984 100644 --- a/asm/include/ov25_02255ACC.inc +++ b/asm/include/ov25_02255ACC.inc @@ -4,7 +4,7 @@ .public sub_02022760 .public sub_0202278C .public sub_02022798 -.public sub_02022974 +.public GF_AssertFail .public ov25_02255C80 .public ov25_02255CA0 .public ov25_02255CA8 diff --git a/asm/include/ov25_02255DBC.inc b/asm/include/ov25_02255DBC.inc index d3e929764e..78a96b4f11 100644 --- a/asm/include/ov25_02255DBC.inc +++ b/asm/include/ov25_02255DBC.inc @@ -1 +1 @@ -.public sub_02022974 +.public GF_AssertFail diff --git a/asm/include/ov29_022566C8.inc b/asm/include/ov29_022566C8.inc index dd7bad959f..1cdcadbad8 100644 --- a/asm/include/ov29_022566C8.inc +++ b/asm/include/ov29_022566C8.inc @@ -14,7 +14,7 @@ .public sub_0201ACCC .public sub_0201ADA4 .public sub_0201AE78 -.public sub_02022974 +.public GF_AssertFail .public sub_02099DA8 .public sub_02099DD0 .public GXS_LoadBG3Char diff --git a/asm/include/ov33_02256474.inc b/asm/include/ov33_02256474.inc index 1e6269fcc0..1b8f7ad6b0 100644 --- a/asm/include/ov33_02256474.inc +++ b/asm/include/ov33_02256474.inc @@ -13,7 +13,7 @@ .public sub_02019CB8 .public sub_0201D15C .public sub_0201D35C -.public sub_02022974 +.public GF_AssertFail .public sub_020759CC .public sub_02079EDC .public NNS_G2dGetUnpackedCharacterData diff --git a/asm/include/ov41_022567B0.inc b/asm/include/ov41_022567B0.inc index b8854a3bda..a91dfe5485 100644 --- a/asm/include/ov41_022567B0.inc +++ b/asm/include/ov41_022567B0.inc @@ -14,7 +14,7 @@ .public sub_0201ADA4 .public sub_0201AE78 .public sub_0201D35C -.public sub_02022974 +.public GF_AssertFail .public sub_02099DA8 .public sub_02099DD0 .public GXS_LoadBG3Char diff --git a/asm/include/ov4_021D0D80.inc b/asm/include/ov4_021D0D80.inc index 22e325a284..a1cb35c66c 100644 --- a/asm/include/ov4_021D0D80.inc +++ b/asm/include/ov4_021D0D80.inc @@ -1,7 +1,7 @@ .public sub_02018144 .public sub_020181C4 .public sub_02018238 -.public sub_02022974 +.public GF_AssertFail .public sub_0202AD28 .public sub_0202AED8 .public sub_0202B270 diff --git a/asm/include/ov4_021D2808.inc b/asm/include/ov4_021D2808.inc index 06e6595bae..994c386bf9 100644 --- a/asm/include/ov4_021D2808.inc +++ b/asm/include/ov4_021D2808.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_02018238 -.public sub_02022974 +.public GF_AssertFail .public sub_0203272C .public sub_0203895C .public NNS_SndInit diff --git a/asm/include/ov56_022561C0.inc b/asm/include/ov56_022561C0.inc index 46a35823ce..67449e9fd8 100644 --- a/asm/include/ov56_022561C0.inc +++ b/asm/include/ov56_022561C0.inc @@ -58,7 +58,7 @@ .public sub_02021E74 .public sub_02022644 .public sub_020227A4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023D28 diff --git a/asm/include/ov58_021D0D80.inc b/asm/include/ov58_021D0D80.inc index f1dccd3129..10b770c04c 100644 --- a/asm/include/ov58_021D0D80.inc +++ b/asm/include/ov58_021D0D80.inc @@ -97,7 +97,7 @@ .public sub_02021F58 .public sub_02022644 .public sub_02022664 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025EF4 diff --git a/asm/include/ov59_021D0D80.inc b/asm/include/ov59_021D0D80.inc index 3216d894ee..f8aad6d139 100644 --- a/asm/include/ov59_021D0D80.inc +++ b/asm/include/ov59_021D0D80.inc @@ -95,7 +95,7 @@ .public sub_02021CAC .public sub_02021CC8 .public sub_02021D6C -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025EF4 diff --git a/asm/include/ov59_021D2A2C.inc b/asm/include/ov59_021D2A2C.inc index f8d9ca9fcd..1696ee7ae9 100644 --- a/asm/include/ov59_021D2A2C.inc +++ b/asm/include/ov59_021D2A2C.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_0202B510 .public sub_0202B530 .public ov59_021D2A34 diff --git a/asm/include/ov59_021D2B44.inc b/asm/include/ov59_021D2B44.inc index c824b2dc10..4a251d5126 100644 --- a/asm/include/ov59_021D2B44.inc +++ b/asm/include/ov59_021D2B44.inc @@ -1,6 +1,6 @@ .public sub_020021D0 .public sub_02018184 -.public sub_02022974 +.public GF_AssertFail .public sub_0202440C .public sub_02025C84 .public sub_02025E38 diff --git a/asm/include/ov59_021D2F88.inc b/asm/include/ov59_021D2F88.inc index 7bde2437ba..ba78dfd4f6 100644 --- a/asm/include/ov59_021D2F88.inc +++ b/asm/include/ov59_021D2F88.inc @@ -1,6 +1,6 @@ .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_0202440C .public sub_02029C60 .public sub_02029CA8 diff --git a/asm/include/ov5_021D0D80.inc b/asm/include/ov5_021D0D80.inc index 43b6616b6f..7515a74581 100644 --- a/asm/include/ov5_021D0D80.inc +++ b/asm/include/ov5_021D0D80.inc @@ -41,7 +41,7 @@ .public sub_02020BD0 .public sub_02020C08 .public sub_02020D68 -.public sub_02022974 +.public GF_AssertFail .public sub_020241B4 .public sub_020241BC .public sub_02027860 diff --git a/asm/include/ov5_021D1A94.inc b/asm/include/ov5_021D1A94.inc index c4204224e9..ee62331e18 100644 --- a/asm/include/ov5_021D1A94.inc +++ b/asm/include/ov5_021D1A94.inc @@ -6,7 +6,7 @@ .public sub_0201CD88 .public sub_0201CDD4 .public sub_0201CE14 -.public sub_02022974 +.public GF_AssertFail .public sub_0203CD5C .public MIi_CpuClear32 .public ov5_021D1B24 diff --git a/asm/include/ov5_021D1C30.inc b/asm/include/ov5_021D1C30.inc index e0e622a27c..d3b91aa0ad 100644 --- a/asm/include/ov5_021D1C30.inc +++ b/asm/include/ov5_021D1C30.inc @@ -1,5 +1,5 @@ .public sub_02005748 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025F34 .public sub_02026310 diff --git a/asm/include/ov5_021D2F14.inc b/asm/include/ov5_021D2F14.inc index 6de26ac1bb..7945e860dc 100644 --- a/asm/include/ov5_021D2F14.inc +++ b/asm/include/ov5_021D2F14.inc @@ -35,7 +35,7 @@ .public sub_02021E90 .public sub_02021EC4 .public sub_02021EE8 -.public sub_02022974 +.public GF_AssertFail .public _f_add .public _f_ftoi .public _f_itof diff --git a/asm/include/ov5_021D37AC.inc b/asm/include/ov5_021D37AC.inc index 0152d3f01f..ca673ea9bb 100644 --- a/asm/include/ov5_021D37AC.inc +++ b/asm/include/ov5_021D37AC.inc @@ -7,7 +7,7 @@ .public sub_02018144 .public sub_020181C4 .public sub_020182CC -.public sub_02022974 +.public GF_AssertFail .public NNS_G3dAnmObjInit .public NNS_G3dRenderObjAddAnmObj .public NNS_G3dRenderObjRemoveAnmObj diff --git a/asm/include/ov5_021D431C.inc b/asm/include/ov5_021D431C.inc index 419065f0fb..7f233caaa7 100644 --- a/asm/include/ov5_021D431C.inc +++ b/asm/include/ov5_021D431C.inc @@ -7,7 +7,7 @@ .public sub_020206B0 .public sub_0202094C .public sub_02020A88 -.public sub_02022974 +.public GF_AssertFail .public sub_02050944 .public sub_02050A60 .public sub_02050A64 diff --git a/asm/include/ov5_021D521C.inc b/asm/include/ov5_021D521C.inc index d8575424ed..7e0965bb14 100644 --- a/asm/include/ov5_021D521C.inc +++ b/asm/include/ov5_021D521C.inc @@ -4,7 +4,7 @@ .public sub_02018238 .public sub_0201E0B8 .public sub_0201E0FC -.public sub_02022974 +.public GF_AssertFail .public NNSi_G3dModifyMatFlag .public MI_CpuFill8 .public ov5_021D52F4 diff --git a/asm/include/ov5_021D56BC.inc b/asm/include/ov5_021D56BC.inc index ee35e47da2..ad7ffa9f49 100644 --- a/asm/include/ov5_021D56BC.inc +++ b/asm/include/ov5_021D56BC.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public FS_InitFile .public FS_OpenFile .public FS_CloseFile diff --git a/asm/include/ov5_021D5B40.inc b/asm/include/ov5_021D5B40.inc index 8e01bcd5b6..e9f47a1369 100644 --- a/asm/include/ov5_021D5B40.inc +++ b/asm/include/ov5_021D5B40.inc @@ -6,4 +6,4 @@ .public sub_020203E0 .public sub_020206BC .public sub_020206D0 -.public sub_02022974 +.public GF_AssertFail diff --git a/asm/include/ov5_021D5BC0.inc b/asm/include/ov5_021D5BC0.inc index 4dc424e14c..a7d320de3a 100644 --- a/asm/include/ov5_021D5BC0.inc +++ b/asm/include/ov5_021D5BC0.inc @@ -1,6 +1,6 @@ .public sub_02006514 .public sub_02006590 -.public sub_02022974 +.public GF_AssertFail .public sub_0205A0A0 .public sub_0205A0BC .public ov5_021D5BC0 diff --git a/asm/include/ov5_021D5CB0.inc b/asm/include/ov5_021D5CB0.inc index f63ec49a8f..857a2d5b26 100644 --- a/asm/include/ov5_021D5CB0.inc +++ b/asm/include/ov5_021D5CB0.inc @@ -7,7 +7,7 @@ .public sub_0201DEAC .public sub_0201DF50 .public sub_0201DFE4 -.public sub_02022974 +.public GF_AssertFail .public NNS_G3dGetTex .public sprintf .public ov5_021D5D30 diff --git a/asm/include/ov5_021D5EB8.inc b/asm/include/ov5_021D5EB8.inc index b8b4897464..1ac5d94cf7 100644 --- a/asm/include/ov5_021D5EB8.inc +++ b/asm/include/ov5_021D5EB8.inc @@ -59,7 +59,7 @@ .public sub_02021CAC .public sub_02021D28 .public sub_02021E50 -.public sub_02022974 +.public GF_AssertFail .public sub_0202309C .public NNS_G2dGetUnpackedCharacterData .public NNS_G2dGetUnpackedPaletteData diff --git a/asm/include/ov5_021DB888.inc b/asm/include/ov5_021DB888.inc index 6141931bac..e5bfe82f61 100644 --- a/asm/include/ov5_021DB888.inc +++ b/asm/include/ov5_021DB888.inc @@ -7,7 +7,7 @@ .public sub_020181C4 .public sub_02018238 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_0203A4B4 .public sub_0203F254 .public sub_0203F28C diff --git a/asm/include/ov5_021DD6FC.inc b/asm/include/ov5_021DD6FC.inc index 087f607090..b06eeb039d 100644 --- a/asm/include/ov5_021DD6FC.inc +++ b/asm/include/ov5_021DD6FC.inc @@ -15,7 +15,7 @@ .public sub_0201ADA4 .public sub_0201ADDC .public sub_0201D78C -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_0203A138 diff --git a/asm/include/ov5_021DDBE8.inc b/asm/include/ov5_021DDBE8.inc index 87cbe3f8f0..466cdf424a 100644 --- a/asm/include/ov5_021DDBE8.inc +++ b/asm/include/ov5_021DDBE8.inc @@ -55,7 +55,7 @@ .public sub_02021964 .public sub_02021B90 .public sub_02021F9C -.public sub_02022974 +.public GF_AssertFail .public sub_02054A40 .public sub_02074470 .public sub_02076AAC diff --git a/asm/include/ov5_021DF440.inc b/asm/include/ov5_021DF440.inc index 94b17b73f3..67aba78385 100644 --- a/asm/include/ov5_021DF440.inc +++ b/asm/include/ov5_021DF440.inc @@ -12,7 +12,7 @@ .public sub_02020CCC .public sub_0202119C .public sub_020213F4 -.public sub_02022974 +.public GF_AssertFail .public sub_02022BD8 .public sub_02022C1C .public sub_02022C9C diff --git a/asm/include/ov5_021DFB54.inc b/asm/include/ov5_021DFB54.inc index 5c68c39ed2..93bf7b289a 100644 --- a/asm/include/ov5_021DFB54.inc +++ b/asm/include/ov5_021DFB54.inc @@ -5,7 +5,7 @@ .public sub_020181C4 .public sub_02018238 .public sub_0201CED0 -.public sub_02022974 +.public GF_AssertFail .public sub_0202CD88 .public sub_0202CF28 .public sub_02050904 diff --git a/asm/include/ov5_021E1154.inc b/asm/include/ov5_021E1154.inc index 530c027072..25b22a42e7 100644 --- a/asm/include/ov5_021E1154.inc +++ b/asm/include/ov5_021E1154.inc @@ -2,7 +2,7 @@ .public sub_020057A4 .public sub_02018184 .public sub_02018238 -.public sub_02022974 +.public GF_AssertFail .public sub_02050904 .public sub_02050A64 .public sub_0205DEB4 diff --git a/asm/include/ov5_021E15F4.inc b/asm/include/ov5_021E15F4.inc index 5a1f23718a..295dc25c21 100644 --- a/asm/include/ov5_021E15F4.inc +++ b/asm/include/ov5_021E15F4.inc @@ -5,7 +5,7 @@ .public sub_0201CA74 .public sub_0201CED8 .public sub_0201E268 -.public sub_02022974 +.public GF_AssertFail .public NNS_G3dRenderObjInit .public NNS_G3dGlbFlushP .public NNS_G3dGlbSetBaseTrans diff --git a/asm/include/ov5_021E1D20.inc b/asm/include/ov5_021E1D20.inc index 3f700985d1..ebee342649 100644 --- a/asm/include/ov5_021E1D20.inc +++ b/asm/include/ov5_021E1D20.inc @@ -18,7 +18,7 @@ .public sub_0201A8FC .public sub_0201ADA4 .public sub_0201D738 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_020246E0 .public sub_02025E38 diff --git a/asm/include/ov5_021E779C.inc b/asm/include/ov5_021E779C.inc index eb5e040022..46e4309409 100644 --- a/asm/include/ov5_021E779C.inc +++ b/asm/include/ov5_021E779C.inc @@ -14,7 +14,7 @@ .public sub_0201CA74 .public sub_0201CBB0 .public sub_0201CED0 -.public sub_02022974 +.public GF_AssertFail .public sub_02038AE0 .public sub_02039D90 .public sub_02039E10 diff --git a/asm/include/ov5_021EAFA4.inc b/asm/include/ov5_021EAFA4.inc index 767c244349..d4156aacc5 100644 --- a/asm/include/ov5_021EAFA4.inc +++ b/asm/include/ov5_021EAFA4.inc @@ -4,7 +4,7 @@ .public sub_02020A94 .public sub_02020AAC .public sub_02020ABC -.public sub_02022974 +.public GF_AssertFail .public MTX_RotX43_ .public MTX_RotY43_ .public MTX_MultVec43 diff --git a/asm/include/ov5_021EB1A0.inc b/asm/include/ov5_021EB1A0.inc index 50c714fd38..c77ef3375b 100644 --- a/asm/include/ov5_021EB1A0.inc +++ b/asm/include/ov5_021EB1A0.inc @@ -8,7 +8,7 @@ .public sub_020213D4 .public sub_020213F4 .public sub_02021444 -.public sub_02022974 +.public GF_AssertFail .public sub_020628BC .public sub_020628C4 .public sub_020628D8 diff --git a/asm/include/ov5_021ECC20.inc b/asm/include/ov5_021ECC20.inc index 6c6bdf79c2..17ebda25ff 100644 --- a/asm/include/ov5_021ECC20.inc +++ b/asm/include/ov5_021ECC20.inc @@ -4,7 +4,7 @@ .public sub_02006D84 .public sub_02018144 .public sub_02018184 -.public sub_02022974 +.public GF_AssertFail .public sub_02062824 .public sub_02062838 .public sub_02062840 diff --git a/asm/include/ov5_021ECE40.inc b/asm/include/ov5_021ECE40.inc index 124efbed1c..f832468144 100644 --- a/asm/include/ov5_021ECE40.inc +++ b/asm/include/ov5_021ECE40.inc @@ -28,7 +28,7 @@ .public sub_020213F4 .public sub_02021404 .public sub_02021414 -.public sub_02022974 +.public GF_AssertFail .public sub_02022BD8 .public sub_02022C1C .public sub_02022C40 diff --git a/asm/include/ov5_021EEF34.inc b/asm/include/ov5_021EEF34.inc index 8b0a6936ce..beacc012ac 100644 --- a/asm/include/ov5_021EEF34.inc +++ b/asm/include/ov5_021EEF34.inc @@ -5,7 +5,7 @@ .public sub_02018184 .public sub_020181C4 .public sub_0201CED0 -.public sub_02022974 +.public GF_AssertFail .public MIi_CpuClear32 .public ov5_021EEF34 .public ov5_021EEF98 diff --git a/asm/include/ov5_021EF250.inc b/asm/include/ov5_021EF250.inc index 7c033b04cf..74fcf02dc7 100644 --- a/asm/include/ov5_021EF250.inc +++ b/asm/include/ov5_021EF250.inc @@ -1,4 +1,4 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public ov5_021EF250 diff --git a/asm/include/ov5_021EF3A8.inc b/asm/include/ov5_021EF3A8.inc index e15bfead4d..4273c7dd56 100644 --- a/asm/include/ov5_021EF3A8.inc +++ b/asm/include/ov5_021EF3A8.inc @@ -1,7 +1,7 @@ .public sub_020177BC .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public ov5_021EF3FC .public ov5_021EF444 .public ov5_021EF46C diff --git a/asm/include/ov5_021EF4BC.inc b/asm/include/ov5_021EF4BC.inc index 2936459dec..983cf6bbee 100644 --- a/asm/include/ov5_021EF4BC.inc +++ b/asm/include/ov5_021EF4BC.inc @@ -9,7 +9,7 @@ .public sub_02013B94 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public G3X_SetHOffset .public memset .public _s32_div_f diff --git a/asm/include/ov5_021EF75C.inc b/asm/include/ov5_021EF75C.inc index 52c15d91e5..9b36ad167b 100644 --- a/asm/include/ov5_021EF75C.inc +++ b/asm/include/ov5_021EF75C.inc @@ -9,7 +9,7 @@ .public sub_020182F0 .public sub_0201CBB0 .public sub_0201CBCC -.public sub_02022974 +.public GF_AssertFail .public NNS_G3dGetMdlSet .public NNS_G3dGetTex .public G3X_SetEdgeColorTable diff --git a/asm/include/ov5_021EFB0C.inc b/asm/include/ov5_021EFB0C.inc index 6b5ac736e2..bf7eef89ec 100644 --- a/asm/include/ov5_021EFB0C.inc +++ b/asm/include/ov5_021EFB0C.inc @@ -2,7 +2,7 @@ .public sub_02018144 .public sub_020181C4 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025F20 .public sub_0202D834 diff --git a/asm/include/ov5_021F007C.inc b/asm/include/ov5_021F007C.inc index b4576dd9c0..b6fb2af885 100644 --- a/asm/include/ov5_021F007C.inc +++ b/asm/include/ov5_021F007C.inc @@ -11,7 +11,7 @@ .public sub_02019EBC .public sub_02019EE0 .public sub_0201FF0C -.public sub_02022974 +.public GF_AssertFail .public sub_0203A0EC .public sub_0203E8E0 .public sub_02050A60 diff --git a/asm/include/ov5_021F067C.inc b/asm/include/ov5_021F067C.inc index af86984653..67c3848e89 100644 --- a/asm/include/ov5_021F067C.inc +++ b/asm/include/ov5_021F067C.inc @@ -5,7 +5,7 @@ .public sub_02018144 .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public memset .public ov5_021F070C .public ov5_021F0740 diff --git a/asm/include/ov5_021F08CC.inc b/asm/include/ov5_021F08CC.inc index 4994f1fbe4..f8841be652 100644 --- a/asm/include/ov5_021F08CC.inc +++ b/asm/include/ov5_021F08CC.inc @@ -13,7 +13,7 @@ .public sub_0201A8FC .public sub_0201CED0 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025E44 diff --git a/asm/include/ov5_021F10E8.inc b/asm/include/ov5_021F10E8.inc index b371a31456..dfaf0f0582 100644 --- a/asm/include/ov5_021F10E8.inc +++ b/asm/include/ov5_021F10E8.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_02062758 .public sub_02062764 .public sub_02062910 diff --git a/asm/include/ov5_021F1CC8.inc b/asm/include/ov5_021F1CC8.inc index 3e1cf6cd6c..eb22aa3282 100644 --- a/asm/include/ov5_021F1CC8.inc +++ b/asm/include/ov5_021F1CC8.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_02062758 .public sub_0206298C .public sub_02062990 diff --git a/asm/include/ov5_021F204C.inc b/asm/include/ov5_021F204C.inc index 03d9eb56c1..b98517df01 100644 --- a/asm/include/ov5_021F204C.inc +++ b/asm/include/ov5_021F204C.inc @@ -2,7 +2,7 @@ .public sub_020212A8 .public sub_02021368 .public sub_02021380 -.public sub_02022974 +.public GF_AssertFail .public sub_02055F00 .public sub_02055F88 .public sub_02062764 diff --git a/asm/include/ov5_021F2850.inc b/asm/include/ov5_021F2850.inc index abfb577d55..1d196a39b3 100644 --- a/asm/include/ov5_021F2850.inc +++ b/asm/include/ov5_021F2850.inc @@ -1,5 +1,5 @@ .public sub_0201E2E0 -.public sub_02022974 +.public GF_AssertFail .public sub_02062758 .public sub_02062C00 .public sub_02063050 diff --git a/asm/include/ov5_021F348C.inc b/asm/include/ov5_021F348C.inc index 1ec8636839..bc60112e87 100644 --- a/asm/include/ov5_021F348C.inc +++ b/asm/include/ov5_021F348C.inc @@ -2,7 +2,7 @@ .public sub_020212A8 .public sub_02021368 .public sub_020213D4 -.public sub_02022974 +.public GF_AssertFail .public sub_02062758 .public sub_02062910 .public sub_02062918 diff --git a/asm/include/ov5_021F4018.inc b/asm/include/ov5_021F4018.inc index 69857c2827..26a6460ff7 100644 --- a/asm/include/ov5_021F4018.inc +++ b/asm/include/ov5_021F4018.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_020644D0 .public sub_02071598 .public sub_020715BC diff --git a/asm/include/ov5_021F428C.inc b/asm/include/ov5_021F428C.inc index 92806f8b45..d58ede94b3 100644 --- a/asm/include/ov5_021F428C.inc +++ b/asm/include/ov5_021F428C.inc @@ -1,5 +1,5 @@ .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02064450 .public sub_0206447C .public sub_020644A4 diff --git a/asm/include/ov5_021F47B0.inc b/asm/include/ov5_021F47B0.inc index e4073eda4d..d658b6712e 100644 --- a/asm/include/ov5_021F47B0.inc +++ b/asm/include/ov5_021F47B0.inc @@ -1,5 +1,5 @@ .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02062758 .public sub_0206298C .public sub_02062A40 diff --git a/asm/include/ov5_021F50BC.inc b/asm/include/ov5_021F50BC.inc index b17338ef68..3ca6c41ae3 100644 --- a/asm/include/ov5_021F50BC.inc +++ b/asm/include/ov5_021F50BC.inc @@ -1,5 +1,5 @@ .public sub_0201E2E0 -.public sub_02022974 +.public GF_AssertFail .public sub_02062764 .public sub_02062910 .public sub_02062918 diff --git a/asm/include/ov5_021F5284.inc b/asm/include/ov5_021F5284.inc index 235b4cef5c..af2bbe34af 100644 --- a/asm/include/ov5_021F5284.inc +++ b/asm/include/ov5_021F5284.inc @@ -1,5 +1,5 @@ .public sub_0201E2E0 -.public sub_02022974 +.public GF_AssertFail .public sub_02062764 .public sub_02062910 .public sub_02062918 diff --git a/asm/include/ov5_021F5A10.inc b/asm/include/ov5_021F5A10.inc index 37178855de..14cac1bfc2 100644 --- a/asm/include/ov5_021F5A10.inc +++ b/asm/include/ov5_021F5A10.inc @@ -3,7 +3,7 @@ .public sub_020212A8 .public sub_02021320 .public sub_020213F4 -.public sub_02022974 +.public GF_AssertFail .public sub_02062764 .public sub_02062910 .public sub_02062918 diff --git a/asm/include/ov5_021F77A8.inc b/asm/include/ov5_021F77A8.inc index 7339588df2..6d06d25384 100644 --- a/asm/include/ov5_021F77A8.inc +++ b/asm/include/ov5_021F77A8.inc @@ -18,7 +18,7 @@ .public sub_020181C4 .public sub_0201A7E8 .public sub_0201A8FC -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02026FE8 diff --git a/asm/include/ov5_021F8560.inc b/asm/include/ov5_021F8560.inc index 5613274263..1a35f0a1ba 100644 --- a/asm/include/ov5_021F8560.inc +++ b/asm/include/ov5_021F8560.inc @@ -1,6 +1,6 @@ .public sub_0201D15C .public sub_0201D1D4 -.public sub_02022974 +.public GF_AssertFail .public sub_0205EB3C .public sub_0205F108 .public sub_02062758 diff --git a/asm/include/ov61_0222B008.inc b/asm/include/ov61_0222B008.inc index f3e90535cd..823eb05430 100644 --- a/asm/include/ov61_0222B008.inc +++ b/asm/include/ov61_0222B008.inc @@ -7,7 +7,7 @@ .public sub_0200C388 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025E5C diff --git a/asm/include/ov61_0222BC4C.inc b/asm/include/ov61_0222BC4C.inc index f1caa89776..9d26d19e95 100644 --- a/asm/include/ov61_0222BC4C.inc +++ b/asm/include/ov61_0222BC4C.inc @@ -1,3 +1,3 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_0202486C .public ov61_0222DE80 diff --git a/asm/include/ov61_0222BF44.inc b/asm/include/ov61_0222BF44.inc index 9a058bf1c4..5bdae92511 100644 --- a/asm/include/ov61_0222BF44.inc +++ b/asm/include/ov61_0222BF44.inc @@ -70,7 +70,7 @@ .public sub_0201FF68 .public sub_0201FF74 .public sub_0201FFE8 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025CCC diff --git a/asm/include/ov62_0222F2C0.inc b/asm/include/ov62_0222F2C0.inc index 0bd2823551..27470b1563 100644 --- a/asm/include/ov62_0222F2C0.inc +++ b/asm/include/ov62_0222F2C0.inc @@ -50,7 +50,7 @@ .public sub_0201FF68 .public sub_0201FF74 .public sub_0201FFE8 -.public sub_02022974 +.public GF_AssertFail .public sub_02023FCC .public sub_02024034 .public sub_0202404C diff --git a/asm/include/ov62_02231690.inc b/asm/include/ov62_02231690.inc index 366fb9776a..f8d6717e59 100644 --- a/asm/include/ov62_02231690.inc +++ b/asm/include/ov62_02231690.inc @@ -72,7 +72,7 @@ .public sub_02022798 .public sub_020227A4 .public sub_020227C0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020237E8 diff --git a/asm/include/ov62_02235278.inc b/asm/include/ov62_02235278.inc index f95ea91b2a..368c100d52 100644 --- a/asm/include/ov62_02235278.inc +++ b/asm/include/ov62_02235278.inc @@ -15,7 +15,7 @@ .public sub_0201FF74 .public sub_02022734 .public sub_02022798 -.public sub_02022974 +.public GF_AssertFail .public sub_0208B8B8 .public sub_0208B9E0 .public MI_CpuFill8 diff --git a/asm/include/ov62_0223CAEC.inc b/asm/include/ov62_0223CAEC.inc index 426722e71d..bf039b81c2 100644 --- a/asm/include/ov62_0223CAEC.inc +++ b/asm/include/ov62_0223CAEC.inc @@ -28,7 +28,7 @@ .public sub_0201D78C .public sub_0201FF0C .public sub_0201FF74 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023D28 diff --git a/asm/include/ov62_0223DFA8.inc b/asm/include/ov62_0223DFA8.inc index fed3256308..6f07432236 100644 --- a/asm/include/ov62_0223DFA8.inc +++ b/asm/include/ov62_0223DFA8.inc @@ -35,7 +35,7 @@ .public sub_0201FF74 .public sub_02022760 .public sub_02022798 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023FCC diff --git a/asm/include/ov62_02246B00.inc b/asm/include/ov62_02246B00.inc index bf1b07da7f..2fb4f820f8 100644 --- a/asm/include/ov62_02246B00.inc +++ b/asm/include/ov62_02246B00.inc @@ -24,7 +24,7 @@ .public sub_0200D810 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020238A0 diff --git a/asm/include/ov62_02248408.inc b/asm/include/ov62_02248408.inc index 23f9c43655..461703a6b0 100644 --- a/asm/include/ov62_02248408.inc +++ b/asm/include/ov62_02248408.inc @@ -6,7 +6,7 @@ .public sub_02017DF0 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020237E8 diff --git a/asm/include/ov63_0222AE60.inc b/asm/include/ov63_0222AE60.inc index d3e2980ed2..611daa0804 100644 --- a/asm/include/ov63_0222AE60.inc +++ b/asm/include/ov63_0222AE60.inc @@ -31,7 +31,7 @@ .public sub_02021E80 .public sub_02021F58 .public sub_02021F74 -.public sub_02022974 +.public GF_AssertFail .public memset .public ov63_0222AFF8 .public ov63_0222B078 diff --git a/asm/include/ov63_0222BCE8.inc b/asm/include/ov63_0222BCE8.inc index d56726ce11..4c3a6c29cf 100644 --- a/asm/include/ov63_0222BCE8.inc +++ b/asm/include/ov63_0222BCE8.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public memcpy .public memset .public ov63_0222BD70 diff --git a/asm/include/ov63_0222BE18.inc b/asm/include/ov63_0222BE18.inc index 62ffb45c1b..48c9ef350f 100644 --- a/asm/include/ov63_0222BE18.inc +++ b/asm/include/ov63_0222BE18.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public memset .public _s32_div_f .public ov63_0222BEB0 diff --git a/asm/include/ov63_0222CA88.inc b/asm/include/ov63_0222CA88.inc index fb65ee21a8..815f4fc3e3 100644 --- a/asm/include/ov63_0222CA88.inc +++ b/asm/include/ov63_0222CA88.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public ov63_0222BDAC .public ov63_0222BF80 .public ov63_0222BF90 diff --git a/asm/include/ov63_0222CCE4.inc b/asm/include/ov63_0222CCE4.inc index 73c6120cf1..bf5c8b64d8 100644 --- a/asm/include/ov63_0222CCE4.inc +++ b/asm/include/ov63_0222CCE4.inc @@ -1,7 +1,7 @@ .public sub_02018144 .public sub_020181C4 .public sub_02021F48 -.public sub_02022974 +.public GF_AssertFail .public memset .public ov63_0222AE60 .public ov63_0222AF14 diff --git a/asm/include/ov63_0222D1C0.inc b/asm/include/ov63_0222D1C0.inc index 1cdb043be0..2558abeb70 100644 --- a/asm/include/ov63_0222D1C0.inc +++ b/asm/include/ov63_0222D1C0.inc @@ -9,7 +9,7 @@ .public sub_02019CB8 .public sub_0201C3C0 .public sub_0201C63C -.public sub_02022974 +.public GF_AssertFail .public _f_add .public _f_ftoi .public _f_itof diff --git a/asm/include/ov63_0222D77C.inc b/asm/include/ov63_0222D77C.inc index ac1b8da2cc..5833d24bfa 100644 --- a/asm/include/ov63_0222D77C.inc +++ b/asm/include/ov63_0222D77C.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public memset .public _u32_div_f .public ov63_0222D810 diff --git a/asm/include/ov64_0222DCE0.inc b/asm/include/ov64_0222DCE0.inc index 2645b93da8..e688cd4ce9 100644 --- a/asm/include/ov64_0222DCE0.inc +++ b/asm/include/ov64_0222DCE0.inc @@ -123,7 +123,7 @@ .public sub_02021D6C .public sub_02021E74 .public sub_02021FD0 -.public sub_02022974 +.public GF_AssertFail .public sub_020230E0 .public sub_02023790 .public sub_020237BC diff --git a/asm/include/ov65_0222DCE0.inc b/asm/include/ov65_0222DCE0.inc index aee761159c..6f3ffc2849 100644 --- a/asm/include/ov65_0222DCE0.inc +++ b/asm/include/ov65_0222DCE0.inc @@ -156,7 +156,7 @@ .public sub_02021E2C .public sub_02021E50 .public sub_02021E74 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023D28 diff --git a/asm/include/ov65_02235060.inc b/asm/include/ov65_02235060.inc index f314fbfe42..2ea1fa66f4 100644 --- a/asm/include/ov65_02235060.inc +++ b/asm/include/ov65_02235060.inc @@ -29,7 +29,7 @@ .public sub_02021CC8 .public sub_02021D6C .public sub_02021F58 -.public sub_02022974 +.public GF_AssertFail .public memset .public _ull_mul .public _s32_div_f diff --git a/asm/include/ov65_0223648C.inc b/asm/include/ov65_0223648C.inc index 6e04bacceb..1e09a57946 100644 --- a/asm/include/ov65_0223648C.inc +++ b/asm/include/ov65_0223648C.inc @@ -85,7 +85,7 @@ .public sub_0201FF74 .public sub_02021964 .public sub_020219F8 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025E44 diff --git a/asm/include/ov66_0222DDF0.inc b/asm/include/ov66_0222DDF0.inc index cb2d607155..fa3c80042a 100644 --- a/asm/include/ov66_0222DDF0.inc +++ b/asm/include/ov66_0222DDF0.inc @@ -13,7 +13,7 @@ .public sub_02018144 .public sub_020181C4 .public sub_0201D35C -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023DF0 diff --git a/asm/include/ov66_02230C44.inc b/asm/include/ov66_02230C44.inc index c3fefceb3e..6e58f18c5f 100644 --- a/asm/include/ov66_02230C44.inc +++ b/asm/include/ov66_02230C44.inc @@ -5,7 +5,7 @@ .public sub_02006844 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E6C .public memset .public ov66_0222E00C diff --git a/asm/include/ov66_02231428.inc b/asm/include/ov66_02231428.inc index 74515329ed..2f2d76ff42 100644 --- a/asm/include/ov66_02231428.inc +++ b/asm/include/ov66_02231428.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_020383E8 .public sub_0203881C .public sub_020996F4 diff --git a/asm/include/ov66_0223177C.inc b/asm/include/ov66_0223177C.inc index f769697c34..eca7f38b0a 100644 --- a/asm/include/ov66_0223177C.inc +++ b/asm/include/ov66_0223177C.inc @@ -12,7 +12,7 @@ .public sub_0200C388 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025EF4 diff --git a/asm/include/ov66_022324F0.inc b/asm/include/ov66_022324F0.inc index 429bbe8a4b..ac05a61b6d 100644 --- a/asm/include/ov66_022324F0.inc +++ b/asm/include/ov66_022324F0.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_0202AD28 .public sub_0202B370 .public sub_0202C878 diff --git a/asm/include/ov66_022343A8.inc b/asm/include/ov66_022343A8.inc index f287a303bc..b56c8c9c6f 100644 --- a/asm/include/ov66_022343A8.inc +++ b/asm/include/ov66_022343A8.inc @@ -32,7 +32,7 @@ .public sub_020213F4 .public sub_02021430 .public sub_02021444 -.public sub_02022974 +.public GF_AssertFail .public sub_0202298C .public sub_020229D8 .public sub_02022A1C diff --git a/asm/include/ov66_02234EA8.inc b/asm/include/ov66_02234EA8.inc index 3589fa48c8..8c7404a86c 100644 --- a/asm/include/ov66_02234EA8.inc +++ b/asm/include/ov66_02234EA8.inc @@ -2,7 +2,7 @@ .public sub_02006CA8 .public sub_02007250 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_020996D4 .public sub_02099764 .public _s32_div_f diff --git a/asm/include/ov67_0225C700.inc b/asm/include/ov67_0225C700.inc index 59693af175..1ab8338d4a 100644 --- a/asm/include/ov67_0225C700.inc +++ b/asm/include/ov67_0225C700.inc @@ -58,7 +58,7 @@ .public sub_0201D78C .public sub_0201FE94 .public sub_0201FF0C -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025E44 diff --git a/asm/include/ov68_0225C700.inc b/asm/include/ov68_0225C700.inc index cab2d5c4f1..08c6ed059d 100644 --- a/asm/include/ov68_0225C700.inc +++ b/asm/include/ov68_0225C700.inc @@ -95,7 +95,7 @@ .public sub_02021C50 .public sub_02021CAC .public sub_02021CC8 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023810 diff --git a/asm/include/ov69_0225C700.inc b/asm/include/ov69_0225C700.inc index d8aeabe9ba..ec53935083 100644 --- a/asm/include/ov69_0225C700.inc +++ b/asm/include/ov69_0225C700.inc @@ -123,7 +123,7 @@ .public sub_02021CAC .public sub_02021CC8 .public sub_02021CE4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020241B4 diff --git a/asm/include/ov6_0223E140.inc b/asm/include/ov6_0223E140.inc index 0eebdd2ea3..a0eda6de0c 100644 --- a/asm/include/ov6_0223E140.inc +++ b/asm/include/ov6_0223E140.inc @@ -49,7 +49,7 @@ .public sub_02020A50 .public sub_02020AAC .public sub_02020ACC -.public sub_02022974 +.public GF_AssertFail .public sub_0203D170 .public sub_02050944 .public sub_02050A60 diff --git a/asm/include/ov6_02240C9C.inc b/asm/include/ov6_02240C9C.inc index 1aba7f0274..7344835e5f 100644 --- a/asm/include/ov6_02240C9C.inc +++ b/asm/include/ov6_02240C9C.inc @@ -3,7 +3,7 @@ .public sub_020181C4 .public sub_0201833C .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025F20 .public sub_02027474 diff --git a/asm/include/ov6_02242984.inc b/asm/include/ov6_02242984.inc index 727af9d368..0f2dcd25a3 100644 --- a/asm/include/ov6_02242984.inc +++ b/asm/include/ov6_02242984.inc @@ -2,7 +2,7 @@ .public sub_02018184 .public sub_020181C4 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_02027474 .public sub_02027560 .public sub_0202D814 diff --git a/asm/include/ov6_02242AF0.inc b/asm/include/ov6_02242AF0.inc index 5b867dd791..cca34b3117 100644 --- a/asm/include/ov6_02242AF0.inc +++ b/asm/include/ov6_02242AF0.inc @@ -2,7 +2,7 @@ .public sub_020057D4 .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02027860 .public sub_02027F6C .public sub_0203D174 diff --git a/asm/include/ov6_02242F74.inc b/asm/include/ov6_02242F74.inc index d904b878ba..e827d27f8c 100644 --- a/asm/include/ov6_02242F74.inc +++ b/asm/include/ov6_02242F74.inc @@ -1,4 +1,4 @@ .public sub_02006ADC .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public ov6_02242FC0 diff --git a/asm/include/ov6_02243004.inc b/asm/include/ov6_02243004.inc index e513bc5a35..e25a24a82e 100644 --- a/asm/include/ov6_02243004.inc +++ b/asm/include/ov6_02243004.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public ov6_0223E6EC .public ov6_0223E700 .public ov6_0223E708 diff --git a/asm/include/ov6_022430C4.inc b/asm/include/ov6_022430C4.inc index 9870792515..53dc692be2 100644 --- a/asm/include/ov6_022430C4.inc +++ b/asm/include/ov6_022430C4.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_0202D830 .public sub_0202D834 .public sub_0206978C diff --git a/asm/include/ov6_02243258.inc b/asm/include/ov6_02243258.inc index b5d33cb918..c7cdd19017 100644 --- a/asm/include/ov6_02243258.inc +++ b/asm/include/ov6_02243258.inc @@ -60,7 +60,7 @@ .public sub_02021D2C .public sub_02021D6C .public sub_02021F58 -.public sub_02022974 +.public GF_AssertFail .public sub_0205D8CC .public sub_0205EB3C .public sub_02062D64 diff --git a/asm/include/ov6_02246034.inc b/asm/include/ov6_02246034.inc index ca3e2450cb..156aff8e53 100644 --- a/asm/include/ov6_02246034.inc +++ b/asm/include/ov6_02246034.inc @@ -1,5 +1,5 @@ .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_0202D834 .public sub_0202D8C4 .public sub_0202D8F8 diff --git a/asm/include/ov6_02246184.inc b/asm/include/ov6_02246184.inc index 002d8a4978..783050a9c8 100644 --- a/asm/include/ov6_02246184.inc +++ b/asm/include/ov6_02246184.inc @@ -4,7 +4,7 @@ .public sub_0200B1EC .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_02023DF0 .public sub_02025E44 diff --git a/asm/include/ov6_022465FC.inc b/asm/include/ov6_022465FC.inc index b6f8cfdf27..5018aa1e98 100644 --- a/asm/include/ov6_022465FC.inc +++ b/asm/include/ov6_022465FC.inc @@ -1,7 +1,7 @@ .public sub_02006AFC .public sub_02013960 .public sub_0201D35C -.public sub_02022974 +.public GF_AssertFail .public sub_0202440C .public sub_0202E374 .public sub_0202E380 diff --git a/asm/include/ov6_02246B74.inc b/asm/include/ov6_02246B74.inc index 87189346eb..60abbce997 100644 --- a/asm/include/ov6_02246B74.inc +++ b/asm/include/ov6_02246B74.inc @@ -1,2 +1,2 @@ .public sub_020138A4 -.public sub_02022974 +.public GF_AssertFail diff --git a/asm/include/ov6_02246C24.inc b/asm/include/ov6_02246C24.inc index 97d135a6f0..3541bd1d01 100644 --- a/asm/include/ov6_02246C24.inc +++ b/asm/include/ov6_02246C24.inc @@ -3,7 +3,7 @@ .public sub_020061E4 .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02039E10 .public sub_02050944 .public sub_02050A60 diff --git a/asm/include/ov6_02246F00.inc b/asm/include/ov6_02246F00.inc index d8f2b86834..488ed59fd6 100644 --- a/asm/include/ov6_02246F00.inc +++ b/asm/include/ov6_02246F00.inc @@ -3,7 +3,7 @@ .public sub_020057D4 .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02050944 .public sub_02050A60 .public sub_02050A64 diff --git a/asm/include/ov6_02247078.inc b/asm/include/ov6_02247078.inc index c4aec213fb..33cc0c0225 100644 --- a/asm/include/ov6_02247078.inc +++ b/asm/include/ov6_02247078.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_02055324 .public ov5_021D41C8 .public ov5_021D4250 diff --git a/asm/include/ov6_02247100.inc b/asm/include/ov6_02247100.inc index 9dd79df8c8..7342141d76 100644 --- a/asm/include/ov6_02247100.inc +++ b/asm/include/ov6_02247100.inc @@ -3,7 +3,7 @@ .public sub_0200F2AC .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_0202B758 .public sub_0202BE00 .public sub_0203A72C diff --git a/asm/include/ov6_022475B0.inc b/asm/include/ov6_022475B0.inc index 224679a271..167bce2673 100644 --- a/asm/include/ov6_022475B0.inc +++ b/asm/include/ov6_022475B0.inc @@ -1,6 +1,6 @@ .public sub_02006ADC .public sub_020181C4 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_0202DA10 .public sub_0202DA24 diff --git a/asm/include/ov6_02247660.inc b/asm/include/ov6_02247660.inc index 271b8148c0..dca4b8a5a6 100644 --- a/asm/include/ov6_02247660.inc +++ b/asm/include/ov6_02247660.inc @@ -1,7 +1,7 @@ .public sub_02006ADC .public sub_020181C4 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_0202B428 .public sub_0202B4A0 .public sub_02039E10 diff --git a/asm/include/ov6_02247A0C.inc b/asm/include/ov6_02247A0C.inc index 4cd7038c62..c6cec8160d 100644 --- a/asm/include/ov6_02247A0C.inc +++ b/asm/include/ov6_02247A0C.inc @@ -19,7 +19,7 @@ .public sub_0201ACF4 .public sub_0201ADA4 .public sub_0201D738 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025E38 diff --git a/asm/include/ov6_02247D30.inc b/asm/include/ov6_02247D30.inc index eac8e5b2fb..863fb3cfa7 100644 --- a/asm/include/ov6_02247D30.inc +++ b/asm/include/ov6_02247D30.inc @@ -1,6 +1,6 @@ .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02039E10 .public sub_02050944 .public sub_02050A60 diff --git a/asm/include/ov6_02248050.inc b/asm/include/ov6_02248050.inc index 6fe0637ddf..d066430268 100644 --- a/asm/include/ov6_02248050.inc +++ b/asm/include/ov6_02248050.inc @@ -17,7 +17,7 @@ .public sub_02017350 .public sub_020181C4 .public sub_020182CC -.public sub_02022974 +.public GF_AssertFail .public sub_0205EA78 .public sub_0205EABC .public sub_0205EAC8 diff --git a/asm/include/ov70_0225C9B4.inc b/asm/include/ov70_0225C9B4.inc index 790893faff..ac905b490e 100644 --- a/asm/include/ov70_0225C9B4.inc +++ b/asm/include/ov70_0225C9B4.inc @@ -3,7 +3,7 @@ .public sub_020181C4 .public sub_0201D15C .public sub_0201D35C -.public sub_02022974 +.public GF_AssertFail .public FX_Div .public memset .public _f_add diff --git a/asm/include/ov70_0225D9A4.inc b/asm/include/ov70_0225D9A4.inc index 9b9f2898a4..c1250bb82b 100644 --- a/asm/include/ov70_0225D9A4.inc +++ b/asm/include/ov70_0225D9A4.inc @@ -145,7 +145,7 @@ .public sub_02021D6C .public sub_02021F24 .public sub_02021F98 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023810 diff --git a/asm/include/ov70_02260B44.inc b/asm/include/ov70_02260B44.inc index e5630b5c43..fb68613520 100644 --- a/asm/include/ov70_02260B44.inc +++ b/asm/include/ov70_02260B44.inc @@ -22,7 +22,7 @@ .public sub_020182CC .public sub_0201CBB0 .public sub_0201D35C -.public sub_02022974 +.public GF_AssertFail .public NNS_G3dAnmObjDisableID .public NNS_G3dTexReleaseTexKey .public NNS_G3dPlttReleasePlttKey diff --git a/asm/include/ov70_02261E10.inc b/asm/include/ov70_02261E10.inc index 0a2b868823..a1e4636e8a 100644 --- a/asm/include/ov70_02261E10.inc +++ b/asm/include/ov70_02261E10.inc @@ -1,7 +1,7 @@ .public sub_02005748 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public FX_Div .public memset .public _f_add diff --git a/asm/include/ov70_02262DA8.inc b/asm/include/ov70_02262DA8.inc index 91e2b2ed52..2462bc8f78 100644 --- a/asm/include/ov70_02262DA8.inc +++ b/asm/include/ov70_02262DA8.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public memset .public ov70_02262F14 .public ov70_02262F64 diff --git a/asm/include/ov70_022630A4.inc b/asm/include/ov70_022630A4.inc index 2f7544ab5d..700e27938d 100644 --- a/asm/include/ov70_022630A4.inc +++ b/asm/include/ov70_022630A4.inc @@ -1,7 +1,7 @@ .public sub_02005748 .public sub_020057D4 .public sub_0201D35C -.public sub_02022974 +.public GF_AssertFail .public FX_Div .public VEC_Add .public _f_add diff --git a/asm/include/ov70_02265F38.inc b/asm/include/ov70_02265F38.inc index 1dede3a814..ab83c0a86e 100644 --- a/asm/include/ov70_02265F38.inc +++ b/asm/include/ov70_02265F38.inc @@ -1,5 +1,5 @@ .public sub_02005748 -.public sub_02022974 +.public GF_AssertFail .public sub_020329E0 .public sub_02032A70 .public sub_02032AC0 diff --git a/asm/include/ov70_02266E9C.inc b/asm/include/ov70_02266E9C.inc index 0403f8a031..3ceef8627e 100644 --- a/asm/include/ov70_02266E9C.inc +++ b/asm/include/ov70_02266E9C.inc @@ -1,6 +1,6 @@ .public sub_02005748 .public sub_0201D35C -.public sub_02022974 +.public GF_AssertFail .public _u32_div_f .public ov63_0222C0AC .public ov66_0222E12C diff --git a/asm/include/ov70_02269190.inc b/asm/include/ov70_02269190.inc index 97eee310a7..3a3be9efc5 100644 --- a/asm/include/ov70_02269190.inc +++ b/asm/include/ov70_02269190.inc @@ -20,7 +20,7 @@ .public sub_02018144 .public sub_020181C4 .public sub_020182CC -.public sub_02022974 +.public GF_AssertFail .public NNS_G3dTexReleaseTexKey .public NNS_G3dPlttReleasePlttKey .public NNS_G3dForceBindMdlTex diff --git a/asm/include/ov70_0226C60C.inc b/asm/include/ov70_0226C60C.inc index b194f18ac4..67a275f034 100644 --- a/asm/include/ov70_0226C60C.inc +++ b/asm/include/ov70_0226C60C.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public NNS_G3dGlbLightColor .public ov66_0222E084 .public ov66_0222E120 diff --git a/asm/include/ov70_0226C8B4.inc b/asm/include/ov70_0226C8B4.inc index 112e7a0ad5..f02119e09b 100644 --- a/asm/include/ov70_0226C8B4.inc +++ b/asm/include/ov70_0226C8B4.inc @@ -2,7 +2,7 @@ .public sub_020057A4 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public _u32_div_f .public ov66_0222E158 .public ov66_0222F104 diff --git a/asm/include/ov70_0226CC74.inc b/asm/include/ov70_0226CC74.inc index 73f41e095a..f667b8442b 100644 --- a/asm/include/ov70_0226CC74.inc +++ b/asm/include/ov70_0226CC74.inc @@ -1,5 +1,5 @@ .public sub_02005748 -.public sub_02022974 +.public GF_AssertFail .public ov63_0222C0AC .public ov66_0222E0DC .public ov66_0222E12C diff --git a/asm/include/ov70_0226CE54.inc b/asm/include/ov70_0226CE54.inc index 5b125c543d..14f42fa289 100644 --- a/asm/include/ov70_0226CE54.inc +++ b/asm/include/ov70_0226CE54.inc @@ -4,7 +4,7 @@ .public sub_02018144 .public sub_020181C4 .public sub_0201D2A4 -.public sub_02022974 +.public GF_AssertFail .public FX_Div .public memset .public _f_add diff --git a/asm/include/ov71_0223B140.inc b/asm/include/ov71_0223B140.inc index 33ef7276c2..2b546649ea 100644 --- a/asm/include/ov71_0223B140.inc +++ b/asm/include/ov71_0223B140.inc @@ -53,7 +53,7 @@ .public sub_02021D6C .public sub_02022644 .public sub_02022664 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020397E4 diff --git a/asm/include/ov71_0223C69C.inc b/asm/include/ov71_0223C69C.inc index a1a6ea81c7..0d4e57f0ba 100644 --- a/asm/include/ov71_0223C69C.inc +++ b/asm/include/ov71_0223C69C.inc @@ -15,7 +15,7 @@ .public sub_0201ACF4 .public sub_0201AE78 .public sub_0201D78C -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020238A0 diff --git a/asm/include/ov71_0223CF0C.inc b/asm/include/ov71_0223CF0C.inc index 9cb720f1d6..1df8cc03a3 100644 --- a/asm/include/ov71_0223CF0C.inc +++ b/asm/include/ov71_0223CF0C.inc @@ -26,7 +26,7 @@ .public sub_02021CC8 .public sub_02021D6C .public sub_02021F9C -.public sub_02022974 +.public GF_AssertFail .public NNS_G2dGetUnpackedPaletteData .public NNS_G2dInitOamManagerModule .public NNS_G2dGetImagePaletteLocation diff --git a/asm/include/ov72_0223D7A0.inc b/asm/include/ov72_0223D7A0.inc index 0a06eee2f5..669b7fe9c8 100644 --- a/asm/include/ov72_0223D7A0.inc +++ b/asm/include/ov72_0223D7A0.inc @@ -95,7 +95,7 @@ .public sub_02021E90 .public sub_02022644 .public sub_02022664 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025E44 diff --git a/asm/include/ov76_0223B140.inc b/asm/include/ov76_0223B140.inc index 7f65a29023..681c6f7ab7 100644 --- a/asm/include/ov76_0223B140.inc +++ b/asm/include/ov76_0223B140.inc @@ -15,7 +15,7 @@ .public sub_0200D5DC .public sub_0200D810 .public sub_020227A4 -.public sub_02022974 +.public GF_AssertFail .public sub_0202CA40 .public sub_02098140 .public ov12_02237E54 diff --git a/asm/include/ov76_0223B870.inc b/asm/include/ov76_0223B870.inc index 46bffde184..8dd524d7f6 100644 --- a/asm/include/ov76_0223B870.inc +++ b/asm/include/ov76_0223B870.inc @@ -78,7 +78,7 @@ .public sub_0201FF74 .public sub_0201FFD0 .public sub_02021F24 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020238A0 diff --git a/asm/include/ov76_0223D338.inc b/asm/include/ov76_0223D338.inc index bb6b7c0bb4..94d8b695f2 100644 --- a/asm/include/ov76_0223D338.inc +++ b/asm/include/ov76_0223D338.inc @@ -56,7 +56,7 @@ .public sub_0201FF74 .public sub_02022798 .public sub_020227A4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023FCC .public sub_0202404C .public sub_0202CA10 diff --git a/asm/include/ov77_021D25B0.inc b/asm/include/ov77_021D25B0.inc index 6a6b7f7516..f4dade4481 100644 --- a/asm/include/ov77_021D25B0.inc +++ b/asm/include/ov77_021D25B0.inc @@ -77,7 +77,7 @@ .public sub_02020990 .public sub_020209F8 .public sub_02020A88 -.public sub_02022974 +.public GF_AssertFail .public sub_020241B4 .public sub_020241BC .public sub_02024220 diff --git a/asm/include/ov77_021D6670.inc b/asm/include/ov77_021D6670.inc index 6d5dfdeca6..00d00127a8 100644 --- a/asm/include/ov77_021D6670.inc +++ b/asm/include/ov77_021D6670.inc @@ -31,7 +31,7 @@ .public sub_02021CAC .public sub_02021CC8 .public sub_02021D28 -.public sub_02022974 +.public GF_AssertFail .public NNS_G2dInitOamManagerModule .public memset .public _s32_div_f diff --git a/asm/include/ov77_021D6C70.inc b/asm/include/ov77_021D6C70.inc index 620e7c6baf..d9ef84b9e6 100644 --- a/asm/include/ov77_021D6C70.inc +++ b/asm/include/ov77_021D6C70.inc @@ -24,7 +24,7 @@ .public sub_02018144 .public sub_020181C4 .public sub_020206BC -.public sub_02022974 +.public GF_AssertFail .public sub_020241B4 .public sub_020241BC .public sub_02075FB4 diff --git a/asm/include/ov78_021D0D80.inc b/asm/include/ov78_021D0D80.inc index 24fda4bbdd..28ad5912c4 100644 --- a/asm/include/ov78_021D0D80.inc +++ b/asm/include/ov78_021D0D80.inc @@ -117,7 +117,7 @@ .public sub_02021BD4 .public sub_02021C50 .public sub_02021CAC -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_020241B4 .public sub_020241BC diff --git a/asm/include/ov7_02249960.inc b/asm/include/ov7_02249960.inc index 5fb824d98c..3a41ef8827 100644 --- a/asm/include/ov7_02249960.inc +++ b/asm/include/ov7_02249960.inc @@ -41,7 +41,7 @@ .public sub_0201C294 .public sub_0201D730 .public sub_0201D738 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025E38 diff --git a/asm/include/ov7_0224BE9C.inc b/asm/include/ov7_0224BE9C.inc index 2bae833b47..656c03cd77 100644 --- a/asm/include/ov7_0224BE9C.inc +++ b/asm/include/ov7_0224BE9C.inc @@ -56,7 +56,7 @@ .public sub_02021CAC .public sub_02021CC8 .public sub_02021D6C -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023868 diff --git a/asm/include/ov80_021D2AF4.inc b/asm/include/ov80_021D2AF4.inc index 099b65df72..11055917f1 100644 --- a/asm/include/ov80_021D2AF4.inc +++ b/asm/include/ov80_021D2AF4.inc @@ -7,7 +7,7 @@ .public sub_02021CAC .public sub_02021E2C .public sub_02021E90 -.public sub_02022974 +.public GF_AssertFail .public FS_InitFile .public FS_OpenFile .public FS_CloseFile diff --git a/asm/include/ov82_0223B140.inc b/asm/include/ov82_0223B140.inc index fb3a6cbf3b..58496501ba 100644 --- a/asm/include/ov82_0223B140.inc +++ b/asm/include/ov82_0223B140.inc @@ -7,7 +7,7 @@ .public sub_02017FC8 .public sub_0201807C .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02032E64 .public sub_02035E18 .public sub_020364F0 diff --git a/asm/include/ov82_0223B2E0.inc b/asm/include/ov82_0223B2E0.inc index c35758008c..3245011652 100644 --- a/asm/include/ov82_0223B2E0.inc +++ b/asm/include/ov82_0223B2E0.inc @@ -1,6 +1,6 @@ .public sub_020067E8 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_0207CB08 .public sub_0207CB20 .public sub_0207CB2C diff --git a/asm/include/ov83_0223B5A0.inc b/asm/include/ov83_0223B5A0.inc index ba0bd922bd..976ffc84c8 100644 --- a/asm/include/ov83_0223B5A0.inc +++ b/asm/include/ov83_0223B5A0.inc @@ -17,7 +17,7 @@ .public sub_0201DCAC .public sub_0201FF0C .public sub_02021E74 -.public sub_02022974 +.public GF_AssertFail .public sub_0202440C .public sub_02027AC0 .public sub_02027B50 diff --git a/asm/include/ov83_0223D4CC.inc b/asm/include/ov83_0223D4CC.inc index eecb8e6c09..1c28618817 100644 --- a/asm/include/ov83_0223D4CC.inc +++ b/asm/include/ov83_0223D4CC.inc @@ -2,7 +2,7 @@ .public sub_0200DA58 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02032798 .public sub_020359DC .public sub_0203608C diff --git a/asm/include/ov83_0223D6A8.inc b/asm/include/ov83_0223D6A8.inc index 4ffdf9d7ac..30a8f3818f 100644 --- a/asm/include/ov83_0223D6A8.inc +++ b/asm/include/ov83_0223D6A8.inc @@ -84,7 +84,7 @@ .public sub_02021DE0 .public sub_02021E80 .public sub_02021FD0 -.public sub_02022974 +.public GF_AssertFail .public sub_02098FFC .public sub_0209903C .public sub_02099160 diff --git a/asm/include/ov83_0223F7F4.inc b/asm/include/ov83_0223F7F4.inc index 206c81d57a..990efe040b 100644 --- a/asm/include/ov83_0223F7F4.inc +++ b/asm/include/ov83_0223F7F4.inc @@ -3,7 +3,7 @@ .public sub_0201D4CC .public sub_0201D580 .public sub_0201E3BC -.public sub_02022974 +.public GF_AssertFail .public sub_0202A9E4 .public sub_0202AABC .public sub_020973C8 diff --git a/asm/include/ov86_0223B140.inc b/asm/include/ov86_0223B140.inc index 17497c0498..8a3a4fa960 100644 --- a/asm/include/ov86_0223B140.inc +++ b/asm/include/ov86_0223B140.inc @@ -84,7 +84,7 @@ .public sub_02021CAC .public sub_02021F7C .public sub_02021F98 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023BE0 diff --git a/asm/include/ov88_0223B140.inc b/asm/include/ov88_0223B140.inc index a69db09bba..0147560581 100644 --- a/asm/include/ov88_0223B140.inc +++ b/asm/include/ov88_0223B140.inc @@ -120,7 +120,7 @@ .public sub_02021EF0 .public sub_02021F58 .public sub_02022664 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020238A0 diff --git a/asm/include/ov8_02249960.inc b/asm/include/ov8_02249960.inc index a0185db09f..27e1a49fb3 100644 --- a/asm/include/ov8_02249960.inc +++ b/asm/include/ov8_02249960.inc @@ -11,7 +11,7 @@ .public sub_0201D35C .public sub_02020690 .public sub_020206BC -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025E44 .public sub_02025F34 diff --git a/asm/include/ov90_021D0D80.inc b/asm/include/ov90_021D0D80.inc index 956de9854b..b9927d07d0 100644 --- a/asm/include/ov90_021D0D80.inc +++ b/asm/include/ov90_021D0D80.inc @@ -66,7 +66,7 @@ .public sub_02021E50 .public sub_02021E80 .public sub_02021E90 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020237E8 diff --git a/asm/include/ov94_022414B8.inc b/asm/include/ov94_022414B8.inc index bc33efaaa2..8faba78d01 100644 --- a/asm/include/ov94_022414B8.inc +++ b/asm/include/ov94_022414B8.inc @@ -38,7 +38,7 @@ .public sub_0201ADA4 .public sub_0201D724 .public sub_0201D738 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025EF0 diff --git a/asm/include/ov94_02242AD0.inc b/asm/include/ov94_02242AD0.inc index 6cae312f0d..d4418526c6 100644 --- a/asm/include/ov94_02242AD0.inc +++ b/asm/include/ov94_02242AD0.inc @@ -18,7 +18,7 @@ .public sub_0201D724 .public sub_0201FF0C .public sub_0201FF74 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_0202440C diff --git a/asm/include/ov94_022444C8.inc b/asm/include/ov94_022444C8.inc index 0787511871..89353450be 100644 --- a/asm/include/ov94_022444C8.inc +++ b/asm/include/ov94_022444C8.inc @@ -2,7 +2,7 @@ .public sub_02006814 .public sub_02006844 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E6C .public sub_02025E8C .public sub_02025EC0 diff --git a/asm/include/ov94_02244950.inc b/asm/include/ov94_02244950.inc index dd3978d563..70e81a1f35 100644 --- a/asm/include/ov94_02244950.inc +++ b/asm/include/ov94_02244950.inc @@ -35,7 +35,7 @@ .public sub_0201D78C .public sub_0201FF0C .public sub_0201FF74 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025D74 diff --git a/asm/include/ov95_02246C20.inc b/asm/include/ov95_02246C20.inc index 90b59f33c9..14ad5c858d 100644 --- a/asm/include/ov95_02246C20.inc +++ b/asm/include/ov95_02246C20.inc @@ -47,7 +47,7 @@ .public sub_02021B90 .public sub_02021CC8 .public sub_02021CE4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02027B50 diff --git a/asm/include/ov96_0223BCE0.inc b/asm/include/ov96_0223BCE0.inc index 59679c558c..731443dbda 100644 --- a/asm/include/ov96_0223BCE0.inc +++ b/asm/include/ov96_0223BCE0.inc @@ -40,7 +40,7 @@ .public sub_0201FF0C .public sub_0201FF74 .public sub_02021CAC -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020238A0 diff --git a/asm/include/ov97_02230410.inc b/asm/include/ov97_02230410.inc index f15218fe7a..923d7cb091 100644 --- a/asm/include/ov97_02230410.inc +++ b/asm/include/ov97_02230410.inc @@ -70,7 +70,7 @@ .public sub_02021D6C .public sub_02021E80 .public sub_02021E90 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023D8C diff --git a/asm/include/ov97_02237694.inc b/asm/include/ov97_02237694.inc index 0add793f0c..9987f64de9 100644 --- a/asm/include/ov97_02237694.inc +++ b/asm/include/ov97_02237694.inc @@ -70,7 +70,7 @@ .public sub_02021E80 .public sub_02021F98 .public sub_02021F9C -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_02024814 .public sub_02024828 diff --git a/asm/include/ov98_02246C20.inc b/asm/include/ov98_02246C20.inc index fda5799fea..3b762043b8 100644 --- a/asm/include/ov98_02246C20.inc +++ b/asm/include/ov98_02246C20.inc @@ -14,7 +14,7 @@ .public sub_0201807C .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023810 diff --git a/asm/include/ov98_022471C8.inc b/asm/include/ov98_022471C8.inc index 87931a5521..8c170cf919 100644 --- a/asm/include/ov98_022471C8.inc +++ b/asm/include/ov98_022471C8.inc @@ -88,7 +88,7 @@ .public sub_0201FF68 .public sub_0201FF74 .public sub_0201FFE8 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023C3C diff --git a/asm/include/ov98_022499C8.inc b/asm/include/ov98_022499C8.inc index a28d2e2796..747b7e4521 100644 --- a/asm/include/ov98_022499C8.inc +++ b/asm/include/ov98_022499C8.inc @@ -1,4 +1,4 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023DF0 diff --git a/asm/include/ov99_021D0D80.inc b/asm/include/ov99_021D0D80.inc index 373ad1edf8..5b4657b308 100644 --- a/asm/include/ov99_021D0D80.inc +++ b/asm/include/ov99_021D0D80.inc @@ -76,7 +76,7 @@ .public sub_02020854 .public sub_02020ACC .public sub_02020ADC -.public sub_02022974 +.public GF_AssertFail .public sub_020241B4 .public sub_020241BC .public sub_02024220 diff --git a/asm/include/ov99_021D1A54.inc b/asm/include/ov99_021D1A54.inc index b1b38f5eb3..e590101ab7 100644 --- a/asm/include/ov99_021D1A54.inc +++ b/asm/include/ov99_021D1A54.inc @@ -45,7 +45,7 @@ .public sub_0201D7E0 .public sub_0201FF0C .public sub_0201FFE8 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public NNSi_G3dModifyMatFlag .public DC_FlushRange diff --git a/asm/include/ov99_021D340C.inc b/asm/include/ov99_021D340C.inc index fa2c8e492e..54ee8ac24a 100644 --- a/asm/include/ov99_021D340C.inc +++ b/asm/include/ov99_021D340C.inc @@ -11,7 +11,7 @@ .public sub_0200D7C0 .public sub_0200D810 .public sub_0201D2B8 -.public sub_02022974 +.public GF_AssertFail .public NNS_G3dRenderObjInit .public G2x_SetBlendAlpha_ .public MI_CpuFill8 diff --git a/asm/include/ov99_021D4134.inc b/asm/include/ov99_021D4134.inc index 624d5ffb86..ed5d988a10 100644 --- a/asm/include/ov99_021D4134.inc +++ b/asm/include/ov99_021D4134.inc @@ -12,7 +12,7 @@ .public sub_02019184 .public sub_0201D2E8 .public sub_02021F98 -.public sub_02022974 +.public GF_AssertFail .public NNS_G3dRenderObjInit .public GX_BeginLoadBGExtPltt .public GX_LoadBGExtPltt diff --git a/asm/include/ov9_02249960.inc b/asm/include/ov9_02249960.inc index 4f047b3e76..2480f0b712 100644 --- a/asm/include/ov9_02249960.inc +++ b/asm/include/ov9_02249960.inc @@ -61,7 +61,7 @@ .public sub_02021C50 .public sub_02021C80 .public sub_02021C94 -.public sub_02022974 +.public GF_AssertFail .public sub_02022D98 .public sub_02022F14 .public sub_02027860 diff --git a/asm/include/overlay4_thumb.inc b/asm/include/overlay4_thumb.inc index 749a9848d5..649d861ab4 100644 --- a/asm/include/overlay4_thumb.inc +++ b/asm/include/overlay4_thumb.inc @@ -1,7 +1,7 @@ .public sub_02018144 .public sub_020181C4 .public sub_02018238 -.public sub_02022974 +.public GF_AssertFail .public sub_0202AD28 .public sub_0202AED8 .public sub_0202B270 diff --git a/asm/include/unk_02000C88.inc b/asm/include/unk_02000C88.inc index 999c9c5a31..ea70f70bef 100644 --- a/asm/include/unk_02000C88.inc +++ b/asm/include/unk_02000C88.inc @@ -37,7 +37,7 @@ .public sub_0201E5FC .public sub_0201E630 .public sub_02022844 -.public sub_02022974 +.public GF_AssertFail .public sub_0202419C .public sub_020241CC .public sub_020244AC diff --git a/asm/include/unk_02002328.inc b/asm/include/unk_02002328.inc index da214a1338..e436fd453b 100644 --- a/asm/include/unk_02002328.inc +++ b/asm/include/unk_02002328.inc @@ -23,4 +23,4 @@ .public sub_0201D134 .public sub_0201D9FC .public sub_0201DB8C -.public sub_02022974 +.public GF_AssertFail diff --git a/asm/include/unk_02002B7C.inc b/asm/include/unk_02002B7C.inc index a5d856ed0f..420f581429 100644 --- a/asm/include/unk_02002B7C.inc +++ b/asm/include/unk_02002B7C.inc @@ -3,7 +3,7 @@ .public sub_02006E84 .public sub_020181C4 .public sub_0201D670 -.public sub_02022974 +.public GF_AssertFail .public sub_020232E0 .public sub_02023318 .public sub_02023330 diff --git a/asm/include/unk_02002F38.inc b/asm/include/unk_02002F38.inc index ea72998db9..6ca98e3f50 100644 --- a/asm/include/unk_02002F38.inc +++ b/asm/include/unk_02002F38.inc @@ -20,7 +20,7 @@ .public sub_0200DA58 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_020241F0 .public sub_02024200 .public sub_02024210 diff --git a/asm/include/unk_02003B60.inc b/asm/include/unk_02003B60.inc index a5295f7182..590aa3641a 100644 --- a/asm/include/unk_02003B60.inc +++ b/asm/include/unk_02003B60.inc @@ -18,7 +18,7 @@ .public sub_02005684 .public sub_020059D0 .public sub_02006224 -.public sub_02022974 +.public GF_AssertFail .public NNS_SndInit .public NNS_SndMain .public NNS_SndPlayerStopSeqByPlayerNo diff --git a/asm/include/unk_020041CC.inc b/asm/include/unk_020041CC.inc index 36222f8cde..8bed222358 100644 --- a/asm/include/unk_020041CC.inc +++ b/asm/include/unk_020041CC.inc @@ -63,7 +63,7 @@ .public sub_020056D4 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02036314 .public NNS_SndSetMasterVolume .public NNS_SndSetMonoFlag diff --git a/asm/include/unk_02005474.inc b/asm/include/unk_02005474.inc index d8778256b8..dd1bab62d5 100644 --- a/asm/include/unk_02005474.inc +++ b/asm/include/unk_02005474.inc @@ -65,7 +65,7 @@ .public sub_02018144 .public sub_020181C4 .public sub_0201CED0 -.public sub_02022974 +.public GF_AssertFail .public NNS_SndPlayerStopSeq .public NNS_SndPlayerStopSeqBySeqNo .public NNS_SndPlayerStopSeqAll diff --git a/asm/include/unk_020064F0.inc b/asm/include/unk_020064F0.inc index 8db92aabbc..89e1b3e5a7 100644 --- a/asm/include/unk_020064F0.inc +++ b/asm/include/unk_020064F0.inc @@ -6,7 +6,7 @@ .public sub_0200671C .public sub_02006724 .public sub_0200675C -.public sub_02022974 +.public GF_AssertFail .public FS_InitFile .public FS_CloseFile .public FS_WaitAsync diff --git a/asm/include/unk_020068C8.inc b/asm/include/unk_020068C8.inc index 326bb473a3..6abde91466 100644 --- a/asm/include/unk_020068C8.inc +++ b/asm/include/unk_020068C8.inc @@ -3,7 +3,7 @@ .public sub_02018144 .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public FS_InitFile .public FS_OpenFile .public FS_CloseFile diff --git a/asm/include/unk_0200762C.inc b/asm/include/unk_0200762C.inc index 0917871c46..2e3acc69b4 100644 --- a/asm/include/unk_0200762C.inc +++ b/asm/include/unk_0200762C.inc @@ -15,7 +15,7 @@ .public sub_020093A0 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public NNS_G2dGetUnpackedCharacterData .public NNS_G2dGetUnpackedPaletteData .public NNS_G2dSetupSoftwareSpriteCamera diff --git a/asm/include/unk_020093B4.inc b/asm/include/unk_020093B4.inc index 294f9df435..8ada3c5b2a 100644 --- a/asm/include/unk_020093B4.inc +++ b/asm/include/unk_020093B4.inc @@ -15,7 +15,7 @@ .public sub_0201E9C0 .public sub_0201F890 .public sub_020218BC -.public sub_02022974 +.public GF_AssertFail .public sub_0202309C .public sub_020230E0 .public GX_GetBankForOBJ diff --git a/asm/include/unk_02009714.inc b/asm/include/unk_02009714.inc index 52557ac916..ab4f8beca7 100644 --- a/asm/include/unk_02009714.inc +++ b/asm/include/unk_02009714.inc @@ -26,7 +26,7 @@ .public sub_02018144 .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_0202298C .public sub_020229D8 .public sub_020229F8 diff --git a/asm/include/unk_0200A328.inc b/asm/include/unk_0200A328.inc index 0388a0f32f..6265d15e88 100644 --- a/asm/include/unk_0200A328.inc +++ b/asm/include/unk_0200A328.inc @@ -26,5 +26,5 @@ .public sub_0201F9F0 .public sub_0201FA58 .public sub_0201FA80 -.public sub_02022974 +.public GF_AssertFail .public NNS_G2dGetImagePaletteLocation diff --git a/asm/include/unk_0200A784.inc b/asm/include/unk_0200A784.inc index b2bc7828b4..0e91951ddc 100644 --- a/asm/include/unk_0200A784.inc +++ b/asm/include/unk_0200A784.inc @@ -9,7 +9,7 @@ .public sub_020181C4 .public sub_02022014 .public sub_0202204C -.public sub_02022974 +.public GF_AssertFail .public sub_020230AC .public sub_020230F0 .public NNS_G2dGetNewOamManagerInstance diff --git a/asm/include/unk_0200A9DC.inc b/asm/include/unk_0200A9DC.inc index 705a8d1b9a..d3f30e661d 100644 --- a/asm/include/unk_0200A9DC.inc +++ b/asm/include/unk_0200A9DC.inc @@ -1,7 +1,7 @@ .public sub_0200A9DC .public sub_0200AA78 .public sub_0200ABB0 -.public sub_02022974 +.public GF_AssertFail .public G2x_SetBlendBrightness_ .public MI_CpuFill8 .public _s32_div_f diff --git a/asm/include/unk_0200AC5C.inc b/asm/include/unk_0200AC5C.inc index 85f42c39f1..9a0d2fb2ad 100644 --- a/asm/include/unk_0200AC5C.inc +++ b/asm/include/unk_0200AC5C.inc @@ -19,7 +19,7 @@ .public sub_0200B240 .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237E8 .public sub_02023D8C diff --git a/asm/include/unk_0200B358.inc b/asm/include/unk_0200B358.inc index 31a0ed864b..e2caf58283 100644 --- a/asm/include/unk_0200B358.inc +++ b/asm/include/unk_0200B358.inc @@ -15,7 +15,7 @@ .public sub_0201D0C8 .public sub_0201D108 .public sub_0201D134 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020237E8 diff --git a/asm/include/unk_0200C6E4.inc b/asm/include/unk_0200C6E4.inc index a1bd14513f..2afa7add78 100644 --- a/asm/include/unk_0200C6E4.inc +++ b/asm/include/unk_0200C6E4.inc @@ -135,7 +135,7 @@ .public sub_02021FD0 .public sub_02021FE0 .public sub_020220F4 -.public sub_02022974 +.public GF_AssertFail .public NNS_G2dInitOamManagerModule .public _f_add .public _fdiv diff --git a/asm/include/unk_0200F174.inc b/asm/include/unk_0200F174.inc index fcc3e3b339..5560176296 100644 --- a/asm/include/unk_0200F174.inc +++ b/asm/include/unk_0200F174.inc @@ -32,7 +32,7 @@ .public sub_020177BC .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public GXx_SetMasterBrightness_ .public GX_LoadBGPltt .public GXS_LoadBGPltt diff --git a/asm/include/unk_0200F85C.inc b/asm/include/unk_0200F85C.inc index fe73212e73..3fe45af9fe 100644 --- a/asm/include/unk_0200F85C.inc +++ b/asm/include/unk_0200F85C.inc @@ -97,7 +97,7 @@ .public sub_02012698 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public FX_Div .public FX_Sqrt .public memcpy diff --git a/asm/include/unk_02012744.inc b/asm/include/unk_02012744.inc index fea989709a..ffb448b758 100644 --- a/asm/include/unk_02012744.inc +++ b/asm/include/unk_02012744.inc @@ -37,7 +37,7 @@ .public sub_02021F98 .public sub_02021FC8 .public sub_02021FE0 -.public sub_02022974 +.public GF_AssertFail .public NNS_G2dInitImageProxy .public NNS_G2dGetImageLocation .public GX_LoadOBJ diff --git a/asm/include/unk_020131EC.inc b/asm/include/unk_020131EC.inc index 6483d99240..71c7fc421d 100644 --- a/asm/include/unk_020131EC.inc +++ b/asm/include/unk_020131EC.inc @@ -18,7 +18,7 @@ .public sub_02013720 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public NNS_G2dGetUnpackedCharacterData .public NNS_G2dGetUnpackedPaletteData .public MIi_CpuCopy16 diff --git a/asm/include/unk_0201378C.inc b/asm/include/unk_0201378C.inc index d75f0cc5cb..1cf55dd036 100644 --- a/asm/include/unk_0201378C.inc +++ b/asm/include/unk_0201378C.inc @@ -3,7 +3,7 @@ .public sub_02013880 .public sub_02013960 .public sub_02013974 -.public sub_02022974 +.public GF_AssertFail .public RTC_Init .public RTC_GetDateTimeAsync .public RTC_ConvertDateTimeToSecond diff --git a/asm/include/unk_02013A04.inc b/asm/include/unk_02013A04.inc index b5732dc9fb..9da8a75280 100644 --- a/asm/include/unk_02013A04.inc +++ b/asm/include/unk_02013A04.inc @@ -3,6 +3,6 @@ .public sub_02013AE8 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_02023868 diff --git a/asm/include/unk_02013B10.inc b/asm/include/unk_02013B10.inc index 96c6b11e55..8b547e517d 100644 --- a/asm/include/unk_02013B10.inc +++ b/asm/include/unk_02013B10.inc @@ -15,7 +15,7 @@ .public sub_02013FD0 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public DC_FlushRange .public MI_WaitDma .public MI_StopDma diff --git a/asm/include/unk_02014000.inc b/asm/include/unk_02014000.inc index d4b7a442df..3875d9186c 100644 --- a/asm/include/unk_02014000.inc +++ b/asm/include/unk_02014000.inc @@ -19,7 +19,7 @@ .public sub_02020680 .public sub_02020784 .public sub_02020854 -.public sub_02022974 +.public GF_AssertFail .public sub_0209C400 .public sub_0209C444 .public sub_0209C4D8 diff --git a/asm/include/unk_020149F0.inc b/asm/include/unk_020149F0.inc index 1f6ec51b35..4bd57f8680 100644 --- a/asm/include/unk_020149F0.inc +++ b/asm/include/unk_020149F0.inc @@ -2,7 +2,7 @@ .public sub_020181C4 .public sub_0201ACCC .public sub_0201D78C -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023D28 diff --git a/asm/include/unk_02014A84.inc b/asm/include/unk_02014A84.inc index 4393cc0934..a0b7d29635 100644 --- a/asm/include/unk_02014A84.inc +++ b/asm/include/unk_02014A84.inc @@ -11,6 +11,6 @@ .public sub_02014DFC .public sub_0201D0C8 .public sub_0201D108 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_02023E2C diff --git a/asm/include/unk_02014D38.inc b/asm/include/unk_02014D38.inc index fce199c89c..0b70ce43ed 100644 --- a/asm/include/unk_02014D38.inc +++ b/asm/include/unk_02014D38.inc @@ -8,7 +8,7 @@ .public sub_02018144 .public sub_020181C4 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_020237E8 .public sub_020245BC .public sub_02025C48 diff --git a/asm/include/unk_02015064.inc b/asm/include/unk_02015064.inc index 8f4981db22..b46f4d95c1 100644 --- a/asm/include/unk_02015064.inc +++ b/asm/include/unk_02015064.inc @@ -28,7 +28,7 @@ .public sub_020155A8 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public NNS_G2dDrawSpriteFast .public NNS_G2dInitImageProxy .public NNS_G2dGetImageLocation diff --git a/asm/include/unk_02015920.inc b/asm/include/unk_02015920.inc index b6f17747a4..8b57f3cfde 100644 --- a/asm/include/unk_02015920.inc +++ b/asm/include/unk_02015920.inc @@ -32,7 +32,7 @@ .public sub_020198E8 .public sub_02019CB8 .public sub_0201C3C0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023FCC .public sub_02024034 .public sub_0202404C diff --git a/asm/include/unk_02015F84.inc b/asm/include/unk_02015F84.inc index d653856e37..7fd96241fb 100644 --- a/asm/include/unk_02015F84.inc +++ b/asm/include/unk_02015F84.inc @@ -29,6 +29,6 @@ .public sub_02016D04 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public MI_CpuFill8 .public _s32_div_f diff --git a/asm/include/unk_02017038.inc b/asm/include/unk_02017038.inc index 04d3119720..430eb1b5b2 100644 --- a/asm/include/unk_02017038.inc +++ b/asm/include/unk_02017038.inc @@ -1,2 +1,2 @@ .public sub_02017038 -.public sub_02022974 +.public GF_AssertFail diff --git a/asm/include/unk_020170BC.inc b/asm/include/unk_020170BC.inc index 8fb385d05c..4b8a0e05be 100644 --- a/asm/include/unk_020170BC.inc +++ b/asm/include/unk_020170BC.inc @@ -9,7 +9,7 @@ .public sub_0201CA74 .public sub_0201CBB0 .public sub_0201CBCC -.public sub_02022974 +.public GF_AssertFail .public NNS_G3dAnmObjInit .public NNS_G3dRenderObjInit .public NNS_G3dRenderObjAddAnmObj diff --git a/asm/include/unk_02017728.inc b/asm/include/unk_02017728.inc index e4c758713f..625ac193a5 100644 --- a/asm/include/unk_02017728.inc +++ b/asm/include/unk_02017728.inc @@ -13,7 +13,7 @@ .public sub_0201CD88 .public sub_0201CDD4 .public sub_0201D640 -.public sub_02022974 +.public GF_AssertFail .public sub_02024358 .public FX_Init .public GX_Init diff --git a/asm/include/unk_02017E74.inc b/asm/include/unk_02017E74.inc index a5ea9b7c79..a3a4f496bf 100644 --- a/asm/include/unk_02017E74.inc +++ b/asm/include/unk_02017E74.inc @@ -3,7 +3,7 @@ .public sub_020180F0 .public sub_02018134 .public sub_0201833C -.public sub_02022974 +.public GF_AssertFail .public sub_02036780 .public sub_0209B49C .public NNS_FndCreateExpHeapEx diff --git a/asm/include/unk_02018340.inc b/asm/include/unk_02018340.inc index a61c0f719d..1cb7adce6a 100644 --- a/asm/include/unk_02018340.inc +++ b/asm/include/unk_02018340.inc @@ -54,7 +54,7 @@ .public sub_0201FF0C .public sub_0201FF68 .public sub_0201FF74 -.public sub_02022974 +.public GF_AssertFail .public GX_SetGraphicsMode .public GXS_SetGraphicsMode .public G2_GetBG0CharPtr diff --git a/asm/include/unk_0201C970.inc b/asm/include/unk_0201C970.inc index bfee897a21..d0aef9650d 100644 --- a/asm/include/unk_0201C970.inc +++ b/asm/include/unk_0201C970.inc @@ -4,7 +4,7 @@ .public sub_0201CA5C .public sub_0201CB1C .public sub_0201FF0C -.public sub_02022974 +.public GF_AssertFail .public sub_02024220 .public sub_020242C4 .public NNS_G3dRenderObjInit diff --git a/asm/include/unk_0201CCF0.inc b/asm/include/unk_0201CCF0.inc index c2877629b0..ac2ca3e03e 100644 --- a/asm/include/unk_0201CCF0.inc +++ b/asm/include/unk_0201CCF0.inc @@ -4,4 +4,4 @@ .public sub_0201CD54 .public sub_0201CDB4 .public sub_0201CE28 -.public sub_02022974 +.public GF_AssertFail diff --git a/asm/include/unk_0201D0C8.inc b/asm/include/unk_0201D0C8.inc index fa029df71c..dc9ec5e76a 100644 --- a/asm/include/unk_0201D0C8.inc +++ b/asm/include/unk_0201D0C8.inc @@ -1,2 +1,2 @@ .public sub_0201D0F0 -.public sub_02022974 +.public GF_AssertFail diff --git a/asm/include/unk_0201D15C.inc b/asm/include/unk_0201D15C.inc index b4fdeddbb6..4fb10081c3 100644 --- a/asm/include/unk_0201D15C.inc +++ b/asm/include/unk_0201D15C.inc @@ -7,7 +7,7 @@ .public sub_0201D318 .public sub_0201D5D4 .public sub_0201D608 -.public sub_02022974 +.public GF_AssertFail .public MTX_Rot22_ .public MTX_ScaleApply22 .public VEC_Subtract diff --git a/asm/include/unk_0201D670.inc b/asm/include/unk_0201D670.inc index 98af4e7782..709f6ddc48 100644 --- a/asm/include/unk_0201D670.inc +++ b/asm/include/unk_0201D670.inc @@ -18,6 +18,6 @@ .public sub_0201DB48 .public sub_0201DB50 .public sub_0201DBD8 -.public sub_02022974 +.public GF_AssertFail .public sub_02023E2C .public MIi_CpuCopy32 diff --git a/asm/include/unk_0201DBEC.inc b/asm/include/unk_0201DBEC.inc index 305ff87f24..70920270a0 100644 --- a/asm/include/unk_0201DBEC.inc +++ b/asm/include/unk_0201DBEC.inc @@ -2,7 +2,7 @@ .public sub_020181C4 .public sub_0201DC68 .public sub_0201DCF8 -.public sub_02022974 +.public GF_AssertFail .public NNS_GfdInitVramTransferManager .public NNS_GfdDoVramTransfer .public NNS_GfdRegisterNewVramTransferTask diff --git a/asm/include/unk_0201E3D8.inc b/asm/include/unk_0201E3D8.inc index 490c7b2046..54164b5cc8 100644 --- a/asm/include/unk_0201E3D8.inc +++ b/asm/include/unk_0201E3D8.inc @@ -7,7 +7,7 @@ .public sub_0201E6CC .public sub_0201E784 .public sub_0201E7FC -.public sub_02022974 +.public GF_AssertFail .public TP_RequestAutoSamplingStartAsync .public TP_RequestAutoSamplingStopAsync .public TP_GetLatestIndexInAuto diff --git a/asm/include/unk_0201E86C.inc b/asm/include/unk_0201E86C.inc index 54a5d931e8..756e9bc715 100644 --- a/asm/include/unk_0201E86C.inc +++ b/asm/include/unk_0201E86C.inc @@ -42,7 +42,7 @@ .public sub_0201F7BC .public sub_0201F80C .public sub_0201F818 -.public sub_02022974 +.public GF_AssertFail .public NNS_G2dInitImageProxy .public NNS_G2dGetImageLocation .public NNS_G2dLoadImage1DMapping diff --git a/asm/include/unk_0201F834.inc b/asm/include/unk_0201F834.inc index accb685ea5..2617a4df41 100644 --- a/asm/include/unk_0201F834.inc +++ b/asm/include/unk_0201F834.inc @@ -23,7 +23,7 @@ .public sub_0201FDE0 .public sub_0201FE1C .public sub_0201FE68 -.public sub_02022974 +.public GF_AssertFail .public NNS_G2dInitImagePaletteProxy .public NNS_G2dGetImagePaletteLocation .public NNS_G2dLoadPalette diff --git a/asm/include/unk_02020020.inc b/asm/include/unk_02020020.inc index 5da977f4a5..be5b1c406e 100644 --- a/asm/include/unk_02020020.inc +++ b/asm/include/unk_02020020.inc @@ -8,7 +8,7 @@ .public sub_02020250 .public sub_02020854 .public sub_02020990 -.public sub_02022974 +.public GF_AssertFail .public MTX_LookAt .public MTX_PerspectiveW .public MTX_OrthoW diff --git a/asm/include/unk_02020AEC.inc b/asm/include/unk_02020AEC.inc index 400a946e0e..3155d531d3 100644 --- a/asm/include/unk_02020AEC.inc +++ b/asm/include/unk_02020AEC.inc @@ -47,7 +47,7 @@ .public sub_0202187C .public sub_0202189C .public sub_020218B4 -.public sub_02022974 +.public GF_AssertFail .public sub_0202414C .public NNS_G3dRenderObjInit .public NNS_G3dTexGetRequiredSize diff --git a/asm/include/unk_020218BC.inc b/asm/include/unk_020218BC.inc index 5bb337d9cd..c03d5afc6e 100644 --- a/asm/include/unk_020218BC.inc +++ b/asm/include/unk_020218BC.inc @@ -33,7 +33,7 @@ .public sub_02022518 .public sub_02022550 .public sub_0202256C -.public sub_02022974 +.public GF_AssertFail .public NNS_G2dGetUnpackedAnimBank .public NNS_G2dGetAnimSequenceByIdx .public NNS_G2dGetAnimCtrlCurrentFrame diff --git a/asm/include/unk_0202298C.inc b/asm/include/unk_0202298C.inc index 17ee32beea..c7f91481cf 100644 --- a/asm/include/unk_0202298C.inc +++ b/asm/include/unk_0202298C.inc @@ -1,7 +1,7 @@ .public sub_02017A40 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_0202298C .public sub_020229D8 .public sub_020229F8 diff --git a/asm/include/unk_020232E0.inc b/asm/include/unk_020232E0.inc index 2fa281e623..034282f2a3 100644 --- a/asm/include/unk_020232E0.inc +++ b/asm/include/unk_020232E0.inc @@ -7,7 +7,7 @@ .public sub_0201D0F0 .public sub_0201D134 .public sub_0201DAA0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023350 .public sub_02023408 .public sub_02023424 diff --git a/asm/include/unk_02023790.inc b/asm/include/unk_02023790.inc index f981d3cbbb..ae593ff9db 100644 --- a/asm/include/unk_02023790.inc +++ b/asm/include/unk_02023790.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237E8 .public sub_02023810 diff --git a/asm/include/unk_02023FCC.inc b/asm/include/unk_02023FCC.inc index b16c186bcf..85ef4f00ef 100644 --- a/asm/include/unk_02023FCC.inc +++ b/asm/include/unk_02023FCC.inc @@ -4,6 +4,6 @@ .public sub_02022760 .public sub_0202278C .public sub_02022798 -.public sub_02022974 +.public GF_AssertFail .public sub_02024028 .public sub_02024144 diff --git a/asm/include/unk_020244AC.inc b/asm/include/unk_020244AC.inc index 6b89f78d39..f3dbd895cc 100644 --- a/asm/include/unk_020244AC.inc +++ b/asm/include/unk_020244AC.inc @@ -5,7 +5,7 @@ .public sub_020181C4 .public sub_0201D30C .public sub_0201D628 -.public sub_02022974 +.public GF_AssertFail .public sub_020245A4 .public sub_020245BC .public sub_0202479C diff --git a/asm/include/unk_02025E68.inc b/asm/include/unk_02025E68.inc index eed40d43de..a66fe5b022 100644 --- a/asm/include/unk_02025E68.inc +++ b/asm/include/unk_02025E68.inc @@ -2,7 +2,7 @@ .public sub_020021F0 .public sub_02002238 .public sub_02018144 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_02023D28 .public sub_02023DF0 diff --git a/asm/include/unk_0202602C.inc b/asm/include/unk_0202602C.inc index c3f59554ad..fd41651e9f 100644 --- a/asm/include/unk_0202602C.inc +++ b/asm/include/unk_0202602C.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_02023D28 .public sub_02023D8C diff --git a/asm/include/unk_0202631C.inc b/asm/include/unk_0202631C.inc index f53e1a7d4e..2847eea271 100644 --- a/asm/include/unk_0202631C.inc +++ b/asm/include/unk_0202631C.inc @@ -1,5 +1,5 @@ .public sub_02018144 -.public sub_02022974 +.public GF_AssertFail .public sub_020245BC .public sub_02026344 .public sub_02026360 diff --git a/asm/include/unk_02027B70.inc b/asm/include/unk_02027B70.inc index 2ec7d7ceaf..4b223f23fc 100644 --- a/asm/include/unk_02027B70.inc +++ b/asm/include/unk_02027B70.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02027BF4 .public sub_02027C50 .public sub_02027C68 diff --git a/asm/include/unk_02027F50.inc b/asm/include/unk_02027F50.inc index 4eee8c54fe..f9314a6ba8 100644 --- a/asm/include/unk_02027F50.inc +++ b/asm/include/unk_02027F50.inc @@ -1,3 +1,3 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_02027F50 .public MI_CpuFill8 diff --git a/asm/include/unk_0202854C.inc b/asm/include/unk_0202854C.inc index 4cdbf0a60d..27c92a89d2 100644 --- a/asm/include/unk_0202854C.inc +++ b/asm/include/unk_0202854C.inc @@ -1,7 +1,7 @@ .public sub_0201384C .public sub_02018144 .public sub_0201D30C -.public sub_02022974 +.public GF_AssertFail .public sub_020245BC .public sub_02025E6C .public sub_02025EC0 diff --git a/asm/include/unk_020298BC.inc b/asm/include/unk_020298BC.inc index 2e3367a4e2..f73ea59fa8 100644 --- a/asm/include/unk_020298BC.inc +++ b/asm/include/unk_020298BC.inc @@ -4,7 +4,7 @@ .public sub_0201525C .public sub_02015290 .public sub_02018144 -.public sub_02022974 +.public GF_AssertFail .public sub_02023D28 .public sub_02023DF0 .public sub_020245BC diff --git a/asm/include/unk_0202ACE0.inc b/asm/include/unk_0202ACE0.inc index ce22f216df..f6b5bdbf04 100644 --- a/asm/include/unk_0202ACE0.inc +++ b/asm/include/unk_0202ACE0.inc @@ -1,5 +1,5 @@ .public sub_020138A4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023DF0 .public sub_020245BC .public sub_0202AF78 diff --git a/asm/include/unk_0202B594.inc b/asm/include/unk_0202B594.inc index d3e929764e..78a96b4f11 100644 --- a/asm/include/unk_0202B594.inc +++ b/asm/include/unk_0202B594.inc @@ -1 +1 @@ -.public sub_02022974 +.public GF_AssertFail diff --git a/asm/include/unk_0202C858.inc b/asm/include/unk_0202C858.inc index 0ef1803a3e..ffb0f3b61a 100644 --- a/asm/include/unk_0202C858.inc +++ b/asm/include/unk_0202C858.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_020245BC .public sub_02025C48 .public sub_02025C84 diff --git a/asm/include/unk_0202C9F4.inc b/asm/include/unk_0202C9F4.inc index d8527a7ad2..16675fec6f 100644 --- a/asm/include/unk_0202C9F4.inc +++ b/asm/include/unk_0202C9F4.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_020245BC .public sub_0202C9F4 .public sub_0202CA10 diff --git a/asm/include/unk_0202CD50.inc b/asm/include/unk_0202CD50.inc index 1ea7270730..34da6c99ae 100644 --- a/asm/include/unk_0202CD50.inc +++ b/asm/include/unk_0202CD50.inc @@ -1,7 +1,7 @@ .public sub_0201D5B8 .public sub_0201D5D4 .public sub_0201D600 -.public sub_02022974 +.public GF_AssertFail .public sub_020245BC .public sub_02026F9C .public sub_0202CD94 diff --git a/asm/include/unk_0202D05C.inc b/asm/include/unk_0202D05C.inc index 852293b27f..ace72444bb 100644 --- a/asm/include/unk_0202D05C.inc +++ b/asm/include/unk_0202D05C.inc @@ -4,7 +4,7 @@ .public sub_02014AC4 .public sub_02014CC0 .public sub_02018144 -.public sub_02022974 +.public GF_AssertFail .public sub_020245BC .public sub_0202D514 .public sub_0202D530 diff --git a/asm/include/unk_0202D7A8.inc b/asm/include/unk_0202D7A8.inc index 9b8199d683..df80ccf790 100644 --- a/asm/include/unk_0202D7A8.inc +++ b/asm/include/unk_0202D7A8.inc @@ -1,5 +1,5 @@ .public sub_0201D35C -.public sub_02022974 +.public GF_AssertFail .public sub_020245BC .public sub_0202D834 .public sub_0202D84C diff --git a/asm/include/unk_0202DAB4.inc b/asm/include/unk_0202DAB4.inc index 8481acab50..7b0f9f06b6 100644 --- a/asm/include/unk_0202DAB4.inc +++ b/asm/include/unk_0202DAB4.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_0202442C .public sub_02025C84 .public sub_0202DAC8 diff --git a/asm/include/unk_0202DF8C.inc b/asm/include/unk_0202DF8C.inc index d2b8a35017..66d5c2e854 100644 --- a/asm/include/unk_0202DF8C.inc +++ b/asm/include/unk_0202DF8C.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023D28 diff --git a/asm/include/unk_0202E2CC.inc b/asm/include/unk_0202E2CC.inc index 86528d6dc9..1c7ff03ce7 100644 --- a/asm/include/unk_0202E2CC.inc +++ b/asm/include/unk_0202E2CC.inc @@ -1,5 +1,5 @@ .public sub_020138A4 -.public sub_02022974 +.public GF_AssertFail .public sub_02025C84 .public sub_0202E35C .public sub_0202E374 diff --git a/asm/include/unk_0202E840.inc b/asm/include/unk_0202E840.inc index eb44fefb38..b0fa27273e 100644 --- a/asm/include/unk_0202E840.inc +++ b/asm/include/unk_0202E840.inc @@ -4,7 +4,7 @@ .public sub_02018144 .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023D28 diff --git a/asm/include/unk_0202EEC0.inc b/asm/include/unk_0202EEC0.inc index 28e34ca1ac..3898cb35dd 100644 --- a/asm/include/unk_0202EEC0.inc +++ b/asm/include/unk_0202EEC0.inc @@ -1,5 +1,5 @@ .public sub_020138EC -.public sub_02022974 +.public GF_AssertFail .public sub_0202EF40 .public sub_02073C2C .public sub_02074470 diff --git a/asm/include/unk_0202F1D4.inc b/asm/include/unk_0202F1D4.inc index ab0cc4d54a..ad330b1374 100644 --- a/asm/include/unk_0202F1D4.inc +++ b/asm/include/unk_0202F1D4.inc @@ -7,7 +7,7 @@ .public sub_020181C4 .public sub_0201D5D4 .public sub_0201D600 -.public sub_02022974 +.public GF_AssertFail .public sub_02024464 .public sub_0202447C .public sub_020247C8 diff --git a/asm/include/unk_02030108.inc b/asm/include/unk_02030108.inc index 9be8488a51..7ca06a83b3 100644 --- a/asm/include/unk_02030108.inc +++ b/asm/include/unk_02030108.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_020245BC .public sub_02030204 .public MI_CpuFill8 diff --git a/asm/include/unk_020302D0.inc b/asm/include/unk_020302D0.inc index 3456fc560a..973eadf6b7 100644 --- a/asm/include/unk_020302D0.inc +++ b/asm/include/unk_020302D0.inc @@ -1,3 +1,3 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_020245BC .public MI_CpuFill8 diff --git a/asm/include/unk_02030494.inc b/asm/include/unk_02030494.inc index 3456fc560a..973eadf6b7 100644 --- a/asm/include/unk_02030494.inc +++ b/asm/include/unk_02030494.inc @@ -1,3 +1,3 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_020245BC .public MI_CpuFill8 diff --git a/asm/include/unk_0203061C.inc b/asm/include/unk_0203061C.inc index 83ca7e12c1..b9fb20ce32 100644 --- a/asm/include/unk_0203061C.inc +++ b/asm/include/unk_0203061C.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_020245BC .public sub_0202D06C .public sub_0202D080 diff --git a/asm/include/unk_02030880.inc b/asm/include/unk_02030880.inc index ba5704265e..7bbe5cb5ce 100644 --- a/asm/include/unk_02030880.inc +++ b/asm/include/unk_02030880.inc @@ -1,5 +1,5 @@ .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_0202448C .public sub_020244A0 .public sub_020246E0 diff --git a/asm/include/unk_02032188.inc b/asm/include/unk_02032188.inc index 63dd28773f..f91190850d 100644 --- a/asm/include/unk_02032188.inc +++ b/asm/include/unk_02032188.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_020321F4 .public sub_02032220 .public sub_0203226C diff --git a/asm/include/unk_020322D8.inc b/asm/include/unk_020322D8.inc index 547958608f..6402a852e7 100644 --- a/asm/include/unk_020322D8.inc +++ b/asm/include/unk_020322D8.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02032198 .public sub_020321F4 .public sub_0203228C diff --git a/asm/include/unk_0203266C.inc b/asm/include/unk_0203266C.inc index d3e929764e..78a96b4f11 100644 --- a/asm/include/unk_0203266C.inc +++ b/asm/include/unk_0203266C.inc @@ -1 +1 @@ -.public sub_02022974 +.public GF_AssertFail diff --git a/asm/include/unk_02032798.inc b/asm/include/unk_02032798.inc index 4e29a654a5..bbbb27f6f0 100644 --- a/asm/include/unk_02032798.inc +++ b/asm/include/unk_02032798.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02035AC4 .public sub_02035D78 .public sub_0203608C diff --git a/asm/include/unk_020329E0.inc b/asm/include/unk_020329E0.inc index 6bd7ab7ba0..cf5f447198 100644 --- a/asm/include/unk_020329E0.inc +++ b/asm/include/unk_020329E0.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025E68 .public sub_02025E80 diff --git a/asm/include/unk_02033200.inc b/asm/include/unk_02033200.inc index 95e9eba906..d800484972 100644 --- a/asm/include/unk_02033200.inc +++ b/asm/include/unk_02033200.inc @@ -3,7 +3,7 @@ .public sub_02017B8C .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E68 .public sub_02025E80 .public sub_02025F20 diff --git a/asm/include/unk_02034198.inc b/asm/include/unk_02034198.inc index e728f40dc7..34cea588c1 100644 --- a/asm/include/unk_02034198.inc +++ b/asm/include/unk_02034198.inc @@ -3,7 +3,7 @@ .public sub_0201384C .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_020318EC .public sub_02031934 .public sub_02031E9C diff --git a/asm/include/unk_020366A0.inc b/asm/include/unk_020366A0.inc index d8a77e6a69..64eaf4661c 100644 --- a/asm/include/unk_020366A0.inc +++ b/asm/include/unk_020366A0.inc @@ -6,7 +6,7 @@ .public sub_0201807C .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02024850 .public sub_02025E38 .public sub_02031FA4 diff --git a/asm/include/unk_02038ED4.inc b/asm/include/unk_02038ED4.inc index 1cac2e4c23..a78c9a4112 100644 --- a/asm/include/unk_02038ED4.inc +++ b/asm/include/unk_02038ED4.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_02024814 .public sub_02024828 .public sub_020364F0 diff --git a/asm/include/unk_0203909C.inc b/asm/include/unk_0203909C.inc index 634c5a8087..bc6f8f991e 100644 --- a/asm/include/unk_0203909C.inc +++ b/asm/include/unk_0203909C.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023D28 diff --git a/asm/include/unk_02039C80.inc b/asm/include/unk_02039C80.inc index 1e2897c8ea..08b8bdfcc9 100644 --- a/asm/include/unk_02039C80.inc +++ b/asm/include/unk_02039C80.inc @@ -1,7 +1,7 @@ .public sub_02006ADC .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02039C80 .public sub_02039D78 .public sub_02039DEC diff --git a/asm/include/unk_0203A024.inc b/asm/include/unk_0203A024.inc index 488c229074..15b1025e3e 100644 --- a/asm/include/unk_0203A024.inc +++ b/asm/include/unk_0203A024.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_0203A024 .public sub_0203A060 .public sub_0203A1D4 diff --git a/asm/include/unk_0203A378.inc b/asm/include/unk_0203A378.inc index e632f61e4b..ef59623a5c 100644 --- a/asm/include/unk_0203A378.inc +++ b/asm/include/unk_0203A378.inc @@ -2,7 +2,7 @@ .public sub_02006B58 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_0203A0B0 .public sub_0203A0EC .public sub_0203A110 diff --git a/asm/include/unk_0203A7D8.inc b/asm/include/unk_0203A7D8.inc index a7c1d329f2..49082694e4 100644 --- a/asm/include/unk_0203A7D8.inc +++ b/asm/include/unk_0203A7D8.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_0203A7D8 .public sub_020507E4 .public sub_0206AF3C diff --git a/asm/include/unk_0203A944.inc b/asm/include/unk_0203A944.inc index dac05ac78a..a09f685fe2 100644 --- a/asm/include/unk_0203A944.inc +++ b/asm/include/unk_0203A944.inc @@ -1,5 +1,5 @@ .public sub_02013900 -.public sub_02022974 +.public GF_AssertFail .public sub_02025CD8 .public sub_0203A174 .public sub_02055C40 diff --git a/asm/include/unk_0203CC84.inc b/asm/include/unk_0203CC84.inc index d1b838dcb1..ae0dcc9cfa 100644 --- a/asm/include/unk_0203CC84.inc +++ b/asm/include/unk_0203CC84.inc @@ -12,7 +12,7 @@ .public sub_0201807C .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02035EA8 .public sub_02035EC8 .public sub_02039D6C diff --git a/asm/include/unk_0203D1B8.inc b/asm/include/unk_0203D1B8.inc index 91c5fe2b40..5fb885d763 100644 --- a/asm/include/unk_0203D1B8.inc +++ b/asm/include/unk_0203D1B8.inc @@ -8,7 +8,7 @@ .public sub_0201D2D0 .public sub_0201D2DC .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023BE0 diff --git a/asm/include/unk_0203E724.inc b/asm/include/unk_0203E724.inc index 4c12028dc8..5ca9977972 100644 --- a/asm/include/unk_0203E724.inc +++ b/asm/include/unk_0203E724.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_0203E7E4 .public sub_0203E800 .public sub_0203E838 diff --git a/asm/include/unk_0203E880.inc b/asm/include/unk_0203E880.inc index d47ca069a8..a5690f8ea0 100644 --- a/asm/include/unk_0203E880.inc +++ b/asm/include/unk_0203E880.inc @@ -6,7 +6,7 @@ .public sub_02018144 .public sub_020181C4 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_0203A088 diff --git a/asm/include/unk_0203F6C4.inc b/asm/include/unk_0203F6C4.inc index a2d75758f4..6604201474 100644 --- a/asm/include/unk_0203F6C4.inc +++ b/asm/include/unk_0203F6C4.inc @@ -40,7 +40,7 @@ .public sub_0201D738 .public sub_02020690 .public sub_02020990 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_02023BE0 .public sub_0202440C diff --git a/asm/include/unk_020494DC.inc b/asm/include/unk_020494DC.inc index 6745ab2c22..9ce79f637b 100644 --- a/asm/include/unk_020494DC.inc +++ b/asm/include/unk_020494DC.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_0202CD88 .public sub_0202CF70 .public sub_0202D230 diff --git a/asm/include/unk_02049D08.inc b/asm/include/unk_02049D08.inc index 2e4db3fb6e..0ce036d0c9 100644 --- a/asm/include/unk_02049D08.inc +++ b/asm/include/unk_02049D08.inc @@ -2,7 +2,7 @@ .public sub_02018184 .public sub_020181C4 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_0202440C .public sub_02025E38 .public sub_02025F30 diff --git a/asm/include/unk_0204AEE8.inc b/asm/include/unk_0204AEE8.inc index 90b7f54911..e30e98face 100644 --- a/asm/include/unk_0204AEE8.inc +++ b/asm/include/unk_0204AEE8.inc @@ -9,7 +9,7 @@ .public sub_0200B48C .public sub_0200B60C .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023DF0 diff --git a/asm/include/unk_0204B64C.inc b/asm/include/unk_0204B64C.inc index 38db2ae8d8..4a61b52462 100644 --- a/asm/include/unk_0204B64C.inc +++ b/asm/include/unk_0204B64C.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_0202CD88 .public sub_0202CF28 .public sub_0202CFEC diff --git a/asm/include/unk_0204C500.inc b/asm/include/unk_0204C500.inc index 80f3218872..8ef31d44ac 100644 --- a/asm/include/unk_0204C500.inc +++ b/asm/include/unk_0204C500.inc @@ -1,5 +1,5 @@ .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02024420 .public sub_02024440 .public sub_02025E38 diff --git a/asm/include/unk_0204E3CC.inc b/asm/include/unk_0204E3CC.inc index 9747f4036b..859eecab73 100644 --- a/asm/include/unk_0204E3CC.inc +++ b/asm/include/unk_0204E3CC.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025F34 .public sub_02025F48 diff --git a/asm/include/unk_0204EDA4.inc b/asm/include/unk_0204EDA4.inc index eaf5b3e160..bf603bf1a9 100644 --- a/asm/include/unk_0204EDA4.inc +++ b/asm/include/unk_0204EDA4.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025E44 .public sub_0203D174 diff --git a/asm/include/unk_0204F02C.inc b/asm/include/unk_0204F02C.inc index d3e929764e..78a96b4f11 100644 --- a/asm/include/unk_0204F02C.inc +++ b/asm/include/unk_0204F02C.inc @@ -1 +1 @@ -.public sub_02022974 +.public GF_AssertFail diff --git a/asm/include/unk_0204F13C.inc b/asm/include/unk_0204F13C.inc index a0477c1f7a..babb7fb535 100644 --- a/asm/include/unk_0204F13C.inc +++ b/asm/include/unk_0204F13C.inc @@ -2,7 +2,7 @@ .public sub_02018144 .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_020247C8 .public sub_02025E38 .public sub_02025E44 diff --git a/asm/include/unk_0204FAB4.inc b/asm/include/unk_0204FAB4.inc index 0bf93c6f6a..9c598bbc93 100644 --- a/asm/include/unk_0204FAB4.inc +++ b/asm/include/unk_0204FAB4.inc @@ -1,7 +1,7 @@ .public sub_02018144 .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025E44 .public sub_02028430 diff --git a/asm/include/unk_0205003C.inc b/asm/include/unk_0205003C.inc index 822bb11179..8a67078146 100644 --- a/asm/include/unk_0205003C.inc +++ b/asm/include/unk_0205003C.inc @@ -1,7 +1,7 @@ .public sub_02018144 .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025E44 .public sub_02028430 diff --git a/asm/include/unk_020507CC.inc b/asm/include/unk_020507CC.inc index 065a15f12e..d6af34a86e 100644 --- a/asm/include/unk_020507CC.inc +++ b/asm/include/unk_020507CC.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_020245BC .public sub_02050870 .public memset diff --git a/asm/include/unk_020508D4.inc b/asm/include/unk_020508D4.inc index d05bd6c3b6..573c95c16c 100644 --- a/asm/include/unk_020508D4.inc +++ b/asm/include/unk_020508D4.inc @@ -1,6 +1,6 @@ .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_0203CD00 .public sub_0203CD4C .public sub_0203CD5C diff --git a/asm/include/unk_02051B50.inc b/asm/include/unk_02051B50.inc index f4d3cb1389..ea2663a752 100644 --- a/asm/include/unk_02051B50.inc +++ b/asm/include/unk_02051B50.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_02051B50 .public sub_02051BBC .public sub_02051BE8 diff --git a/asm/include/unk_02051D8C.inc b/asm/include/unk_02051D8C.inc index 7a8eca2466..e4db9e853b 100644 --- a/asm/include/unk_02051D8C.inc +++ b/asm/include/unk_02051D8C.inc @@ -6,7 +6,7 @@ .public sub_02013974 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023E2C diff --git a/asm/include/unk_020528D0.inc b/asm/include/unk_020528D0.inc index 15d5c7e70e..27e2bfe688 100644 --- a/asm/include/unk_020528D0.inc +++ b/asm/include/unk_020528D0.inc @@ -25,7 +25,7 @@ .public sub_0201ADA4 .public sub_0201D78C .public sub_0201FE94 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02025E38 diff --git a/asm/include/unk_020530C8.inc b/asm/include/unk_020530C8.inc index 533c2dc460..f32c4070b9 100644 --- a/asm/include/unk_020530C8.inc +++ b/asm/include/unk_020530C8.inc @@ -17,7 +17,7 @@ .public sub_02018184 .public sub_020181C4 .public sub_0201A8FC -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_020247E0 .public sub_02025E38 diff --git a/asm/include/unk_02054884.inc b/asm/include/unk_02054884.inc index d21db60989..7367182872 100644 --- a/asm/include/unk_02054884.inc +++ b/asm/include/unk_02054884.inc @@ -1,6 +1,6 @@ .public sub_02017070 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_0202F180 .public sub_02054884 diff --git a/asm/include/unk_02054BD0.inc b/asm/include/unk_02054BD0.inc index afb612daeb..98fb14e476 100644 --- a/asm/include/unk_02054BD0.inc +++ b/asm/include/unk_02054BD0.inc @@ -3,7 +3,7 @@ .public sub_02006DC8 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02039DEC .public sub_02039E10 .public sub_02039E20 diff --git a/asm/include/unk_02054D00.inc b/asm/include/unk_02054D00.inc index a45131b8a0..97254c6677 100644 --- a/asm/include/unk_02054D00.inc +++ b/asm/include/unk_02054D00.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_02039E10 .public sub_02054C0C .public sub_02054D00 diff --git a/asm/include/unk_02055808.inc b/asm/include/unk_02055808.inc index 1d0919b953..cdcd46f51d 100644 --- a/asm/include/unk_02055808.inc +++ b/asm/include/unk_02055808.inc @@ -1,6 +1,6 @@ .public sub_0200F174 .public sub_0200F2AC -.public sub_02022974 +.public GF_AssertFail .public sub_0203CD44 .public sub_0203CD4C .public sub_02050944 diff --git a/asm/include/unk_02055C50.inc b/asm/include/unk_02055C50.inc index 0739ce1a08..6d8b073ce8 100644 --- a/asm/include/unk_02055C50.inc +++ b/asm/include/unk_02055C50.inc @@ -2,7 +2,7 @@ .public sub_020181C4 .public sub_0201CA3C .public sub_0201CED8 -.public sub_02022974 +.public GF_AssertFail .public sub_02027854 .public sub_02027BF4 .public sub_02027D04 diff --git a/asm/include/unk_020562F8.inc b/asm/include/unk_020562F8.inc index 643e8c5d55..1f34ec0b4b 100644 --- a/asm/include/unk_020562F8.inc +++ b/asm/include/unk_020562F8.inc @@ -3,7 +3,7 @@ .public sub_0201398C .public sub_020181C4 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_02024440 .public sub_0202CD88 .public sub_0202CFEC diff --git a/asm/include/unk_02056720.inc b/asm/include/unk_02056720.inc index 6cbf457078..826d3cd56c 100644 --- a/asm/include/unk_02056720.inc +++ b/asm/include/unk_02056720.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_020245BC .public sub_020567F0 .public sub_02056AAC diff --git a/asm/include/unk_02056B30.inc b/asm/include/unk_02056B30.inc index 02ac094c0b..59de1ed2d1 100644 --- a/asm/include/unk_02056B30.inc +++ b/asm/include/unk_02056B30.inc @@ -7,7 +7,7 @@ .public sub_020181C4 .public sub_02020690 .public sub_02020A5C -.public sub_02022974 +.public GF_AssertFail .public sub_0203A274 .public sub_0203A288 .public sub_0203A2A8 diff --git a/asm/include/unk_02057518.inc b/asm/include/unk_02057518.inc index 2a8d301804..0d9bc53694 100644 --- a/asm/include/unk_02057518.inc +++ b/asm/include/unk_02057518.inc @@ -2,7 +2,7 @@ .public sub_0200DA58 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E80 .public sub_02025F30 .public sub_02025FCC diff --git a/asm/include/unk_0205964C.inc b/asm/include/unk_0205964C.inc index 52facbbb0c..6d76df3e9b 100644 --- a/asm/include/unk_0205964C.inc +++ b/asm/include/unk_0205964C.inc @@ -5,7 +5,7 @@ .public sub_0200F3B0 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02032AC0 .public sub_02032CE8 .public sub_02032EE8 diff --git a/asm/include/unk_0205B33C.inc b/asm/include/unk_0205B33C.inc index 758bb066b2..3db78952b4 100644 --- a/asm/include/unk_0205B33C.inc +++ b/asm/include/unk_0205B33C.inc @@ -21,7 +21,7 @@ .public sub_02018144 .public sub_020181C4 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025EF0 .public sub_02025F20 diff --git a/asm/include/unk_0205C22C.inc b/asm/include/unk_0205C22C.inc index 89b223b608..681a327859 100644 --- a/asm/include/unk_0205C22C.inc +++ b/asm/include/unk_0205C22C.inc @@ -6,7 +6,7 @@ .public sub_0201807C .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020245BC diff --git a/asm/include/unk_0205C980.inc b/asm/include/unk_0205C980.inc index d9f732b819..66116e81f2 100644 --- a/asm/include/unk_0205C980.inc +++ b/asm/include/unk_0205C980.inc @@ -2,5 +2,5 @@ .public sub_0200B960 .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_0205C9E0 diff --git a/asm/include/unk_0205CA94.inc b/asm/include/unk_0205CA94.inc index e31f452451..ec4be13eb2 100644 --- a/asm/include/unk_0205CA94.inc +++ b/asm/include/unk_0205CA94.inc @@ -37,7 +37,7 @@ .public sub_02021CAC .public sub_02021D6C .public sub_02021E2C -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025F30 .public sub_0205CA94 diff --git a/asm/include/unk_0205DFC4.inc b/asm/include/unk_0205DFC4.inc index bed8a6dc92..93aba04906 100644 --- a/asm/include/unk_0205DFC4.inc +++ b/asm/include/unk_0205DFC4.inc @@ -1,7 +1,7 @@ .public sub_02018184 .public sub_020181C4 .public sub_0201D15C -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025FCC .public sub_02032EE8 diff --git a/asm/include/unk_0205E7D0.inc b/asm/include/unk_0205E7D0.inc index f828e3ec84..5ddc8ed58e 100644 --- a/asm/include/unk_0205E7D0.inc +++ b/asm/include/unk_0205E7D0.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_0205E8E0 .public sub_0205E8FC .public sub_0205E91C diff --git a/asm/include/unk_0205F180.inc b/asm/include/unk_0205F180.inc index 0260a1fe33..11f692be34 100644 --- a/asm/include/unk_0205F180.inc +++ b/asm/include/unk_0205F180.inc @@ -1,5 +1,5 @@ .public sub_02005748 -.public sub_02022974 +.public GF_AssertFail .public sub_0202CD88 .public sub_0202CF28 .public sub_02054F94 diff --git a/asm/include/unk_02061804.inc b/asm/include/unk_02061804.inc index 1b16aa9b20..ff5ed705bf 100644 --- a/asm/include/unk_02061804.inc +++ b/asm/include/unk_02061804.inc @@ -3,7 +3,7 @@ .public sub_02018144 .public sub_02018184 .public sub_02018238 -.public sub_02022974 +.public GF_AssertFail .public sub_0203F164 .public sub_0203F188 .public sub_0203F19C diff --git a/asm/include/unk_0206450C.inc b/asm/include/unk_0206450C.inc index 30515168fa..5952fd8f3d 100644 --- a/asm/include/unk_0206450C.inc +++ b/asm/include/unk_0206450C.inc @@ -1,5 +1,5 @@ .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_0205EABC .public sub_0205EAC8 .public sub_0205EB3C diff --git a/asm/include/unk_020655F4.inc b/asm/include/unk_020655F4.inc index 72e1b94246..59c4e48a14 100644 --- a/asm/include/unk_020655F4.inc +++ b/asm/include/unk_020655F4.inc @@ -4,7 +4,7 @@ .public sub_02018184 .public sub_02018238 .public sub_0201CED0 -.public sub_02022974 +.public GF_AssertFail .public sub_02062858 .public sub_020628BC .public sub_020628C4 diff --git a/asm/include/unk_020673B8.inc b/asm/include/unk_020673B8.inc index f294d4ac0e..623dec8bca 100644 --- a/asm/include/unk_020673B8.inc +++ b/asm/include/unk_020673B8.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_02062950 .public sub_02062974 .public sub_0206298C diff --git a/asm/include/unk_020677F4.inc b/asm/include/unk_020677F4.inc index f5cae857e0..6fb5269482 100644 --- a/asm/include/unk_020677F4.inc +++ b/asm/include/unk_020677F4.inc @@ -1,5 +1,5 @@ .public sub_02021368 -.public sub_02022974 +.public GF_AssertFail .public sub_02055F00 .public sub_02055F20 .public sub_020628BC diff --git a/asm/include/unk_02067A84.inc b/asm/include/unk_02067A84.inc index 802a196463..af7c217289 100644 --- a/asm/include/unk_02067A84.inc +++ b/asm/include/unk_02067A84.inc @@ -3,7 +3,7 @@ .public sub_02018184 .public sub_02018238 .public sub_0201CED0 -.public sub_02022974 +.public GF_AssertFail .public sub_0203E880 .public sub_0203E8B0 .public sub_0203F254 diff --git a/asm/include/unk_0206940C.inc b/asm/include/unk_0206940C.inc index fdb5a65998..2105be42e2 100644 --- a/asm/include/unk_0206940C.inc +++ b/asm/include/unk_0206940C.inc @@ -4,7 +4,7 @@ .public sub_0201CF7C .public sub_0201CFEC .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_0202D830 .public sub_0202D834 .public sub_0202D9C4 diff --git a/asm/include/unk_0206A8DC.inc b/asm/include/unk_0206A8DC.inc index 74e9e75398..a70b05f6c0 100644 --- a/asm/include/unk_0206A8DC.inc +++ b/asm/include/unk_0206A8DC.inc @@ -1,5 +1,5 @@ .public sub_02013948 -.public sub_02022974 +.public GF_AssertFail .public sub_020507F0 .public sub_0205081C .public sub_02050844 diff --git a/asm/include/unk_0206AFE0.inc b/asm/include/unk_0206AFE0.inc index 26f7b6cbc0..97b7680dd3 100644 --- a/asm/include/unk_0206AFE0.inc +++ b/asm/include/unk_0206AFE0.inc @@ -1,5 +1,5 @@ .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_0202B428 .public sub_0202B4A0 .public sub_0203A720 diff --git a/asm/include/unk_0206B70C.inc b/asm/include/unk_0206B70C.inc index 099502e1a0..d7ef6e6944 100644 --- a/asm/include/unk_0206B70C.inc +++ b/asm/include/unk_0206B70C.inc @@ -1,6 +1,6 @@ .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025F30 .public sub_02039E30 diff --git a/asm/include/unk_0206C2D0.inc b/asm/include/unk_0206C2D0.inc index d8f06743ed..678854ff33 100644 --- a/asm/include/unk_0206C2D0.inc +++ b/asm/include/unk_0206C2D0.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025F34 .public sub_0202C834 diff --git a/asm/include/unk_0206C33C.inc b/asm/include/unk_0206C33C.inc index 974cf4bc84..954e70c61c 100644 --- a/asm/include/unk_0206C33C.inc +++ b/asm/include/unk_0206C33C.inc @@ -1,6 +1,6 @@ .public sub_020181C4 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025F24 .public sub_0202D834 diff --git a/asm/include/unk_0206C784.inc b/asm/include/unk_0206C784.inc index a8475de749..7dbf36fff4 100644 --- a/asm/include/unk_0206C784.inc +++ b/asm/include/unk_0206C784.inc @@ -8,7 +8,7 @@ .public sub_020181C4 .public sub_02020690 .public sub_020206B0 -.public sub_02022974 +.public GF_AssertFail .public sub_0203E2AC .public sub_0203E2D4 .public sub_02050944 diff --git a/asm/include/unk_0206CCB0.inc b/asm/include/unk_0206CCB0.inc index c2b7e952d1..79f19a7912 100644 --- a/asm/include/unk_0206CCB0.inc +++ b/asm/include/unk_0206CCB0.inc @@ -33,7 +33,7 @@ .public sub_020181C4 .public sub_0201D2E8 .public sub_0201D35C -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023D28 diff --git a/asm/include/unk_0207064C.inc b/asm/include/unk_0207064C.inc index 97d2e7cafc..06b16b8f78 100644 --- a/asm/include/unk_0207064C.inc +++ b/asm/include/unk_0207064C.inc @@ -1,6 +1,6 @@ .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_0203A7F0 .public sub_0203A8A0 .public sub_02050A60 diff --git a/asm/include/unk_0207070C.inc b/asm/include/unk_0207070C.inc index c92ce079e9..a3ca17aa0a 100644 --- a/asm/include/unk_0207070C.inc +++ b/asm/include/unk_0207070C.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02025E38 .public sub_02025F34 .public sub_0202B758 diff --git a/asm/include/unk_020711EC.inc b/asm/include/unk_020711EC.inc index 9304616862..37101c4544 100644 --- a/asm/include/unk_020711EC.inc +++ b/asm/include/unk_020711EC.inc @@ -2,7 +2,7 @@ .public sub_0200DA58 .public sub_02018144 .public sub_02018238 -.public sub_02022974 +.public GF_AssertFail .public sub_0207120C .public sub_0207122C .public sub_0207136C diff --git a/asm/include/unk_0207160C.inc b/asm/include/unk_0207160C.inc index 8a7842182b..a9c9f7edbc 100644 --- a/asm/include/unk_0207160C.inc +++ b/asm/include/unk_0207160C.inc @@ -2,7 +2,7 @@ .public sub_020057A4 .public sub_02018184 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02027860 .public sub_02027F5C .public sub_02027F6C diff --git a/asm/include/unk_02071B10.inc b/asm/include/unk_02071B10.inc index 90051ee3ab..0e8fc09187 100644 --- a/asm/include/unk_02071B10.inc +++ b/asm/include/unk_02071B10.inc @@ -1,4 +1,4 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_02027860 .public sub_02027F5C .public sub_02027F6C diff --git a/asm/include/unk_02073838.inc b/asm/include/unk_02073838.inc index 5930e686f4..46ccfc42dc 100644 --- a/asm/include/unk_02073838.inc +++ b/asm/include/unk_02073838.inc @@ -7,7 +7,7 @@ .public sub_0201CAB0 .public sub_0201CBCC .public sub_0201E2E0 -.public sub_02022974 +.public GF_AssertFail .public sub_02073838 .public sub_02073848 .public sub_020738C0 diff --git a/asm/include/unk_02073C2C.inc b/asm/include/unk_02073C2C.inc index bb3fa65737..0d790e2d2d 100644 --- a/asm/include/unk_02073C2C.inc +++ b/asm/include/unk_02073C2C.inc @@ -31,7 +31,7 @@ .public sub_0201D5D4 .public sub_0201D600 .public sub_02021F24 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023810 diff --git a/asm/include/unk_020797C8.inc b/asm/include/unk_020797C8.inc index fdcfcac5c6..205187c2b7 100644 --- a/asm/include/unk_020797C8.inc +++ b/asm/include/unk_020797C8.inc @@ -1,7 +1,7 @@ .public sub_0200B144 .public sub_0200B190 .public sub_0200B240 -.public sub_02022974 +.public GF_AssertFail .public sub_02023D28 .public sub_02023DF0 .public sub_02024804 diff --git a/asm/include/unk_02079FEC.inc b/asm/include/unk_02079FEC.inc index dafc4e8fbb..1ec1b22cf0 100644 --- a/asm/include/unk_02079FEC.inc +++ b/asm/include/unk_02079FEC.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_020245BC .public sub_02073C2C .public sub_02074470 diff --git a/asm/include/unk_0207AE68.inc b/asm/include/unk_0207AE68.inc index 73605a3d77..b0a0b245d4 100644 --- a/asm/include/unk_0207AE68.inc +++ b/asm/include/unk_0207AE68.inc @@ -84,7 +84,7 @@ .public sub_0201FF00 .public sub_0201FF0C .public sub_0201FFD0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020241BC .public sub_020241F0 diff --git a/asm/include/unk_0207C63C.inc b/asm/include/unk_0207C63C.inc index e74ece95c6..8d0dce6cbb 100644 --- a/asm/include/unk_0207C63C.inc +++ b/asm/include/unk_0207C63C.inc @@ -18,7 +18,7 @@ .public sub_0201FF0C .public sub_0201FF68 .public sub_020206BC -.public sub_02022974 +.public GF_AssertFail .public sub_020241B4 .public sub_020241BC .public sub_02024220 diff --git a/asm/include/unk_0207C908.inc b/asm/include/unk_0207C908.inc index 26d851693b..cf0e45eafe 100644 --- a/asm/include/unk_0207C908.inc +++ b/asm/include/unk_0207C908.inc @@ -9,7 +9,7 @@ .public sub_0200D090 .public sub_0200D0A0 .public sub_0200D0F4 -.public sub_02022974 +.public GF_AssertFail .public sub_0207C908 .public sub_0207C920 .public sub_0207C924 diff --git a/asm/include/unk_0207E060.inc b/asm/include/unk_0207E060.inc index 32ef610312..e9fb0c538b 100644 --- a/asm/include/unk_0207E060.inc +++ b/asm/include/unk_0207E060.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02025F30 .public sub_02025F8C .public sub_02025FCC diff --git a/asm/include/unk_0208694C.inc b/asm/include/unk_0208694C.inc index baef5f9d8d..a6ba05a5ed 100644 --- a/asm/include/unk_0208694C.inc +++ b/asm/include/unk_0208694C.inc @@ -112,7 +112,7 @@ .public sub_02021F58 .public sub_02021FD0 .public sub_02021FE0 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02023810 diff --git a/asm/include/unk_020890F4.inc b/asm/include/unk_020890F4.inc index 3f98e62016..bf279e043b 100644 --- a/asm/include/unk_020890F4.inc +++ b/asm/include/unk_020890F4.inc @@ -34,7 +34,7 @@ .public sub_0201FF68 .public sub_0201FF74 .public sub_0201FFE8 -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_02024034 diff --git a/asm/include/unk_0208A3F4.inc b/asm/include/unk_0208A3F4.inc index 33398f20d7..8a4ed12a99 100644 --- a/asm/include/unk_0208A3F4.inc +++ b/asm/include/unk_0208A3F4.inc @@ -50,7 +50,7 @@ .public sub_0201D78C .public sub_0201ED94 .public sub_0201EE28 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_02027B50 .public sub_0208AAB4 diff --git a/asm/include/unk_0208C010.inc b/asm/include/unk_0208C010.inc index 43e1e45862..7add9dedff 100644 --- a/asm/include/unk_0208C010.inc +++ b/asm/include/unk_0208C010.inc @@ -1,3 +1,3 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_0208BE68 .public sub_0208C010 diff --git a/asm/include/unk_020933F8.inc b/asm/include/unk_020933F8.inc index 1085931d4b..3da00a2261 100644 --- a/asm/include/unk_020933F8.inc +++ b/asm/include/unk_020933F8.inc @@ -19,7 +19,7 @@ .public sub_0201D2DC .public sub_0201D2E8 .public sub_0201D30C -.public sub_02022974 +.public GF_AssertFail .public sub_02023790 .public sub_020237BC .public sub_020237E8 diff --git a/asm/include/unk_02094EDC.inc b/asm/include/unk_02094EDC.inc index 42592133a9..6f300f0bfe 100644 --- a/asm/include/unk_02094EDC.inc +++ b/asm/include/unk_02094EDC.inc @@ -11,7 +11,7 @@ .public sub_02018184 .public sub_020181C4 .public sub_0201D2E8 -.public sub_02022974 +.public GF_AssertFail .public sub_020237BC .public sub_0202A25C .public sub_0202A35C diff --git a/asm/include/unk_02095AF0.inc b/asm/include/unk_02095AF0.inc index 686ff070d5..f317bbaf54 100644 --- a/asm/include/unk_02095AF0.inc +++ b/asm/include/unk_02095AF0.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_02029C64 .public sub_02032798 .public sub_0203597C diff --git a/asm/include/unk_02095E98.inc b/asm/include/unk_02095E98.inc index 6cdab54cd0..6b870d7b1a 100644 --- a/asm/include/unk_02095E98.inc +++ b/asm/include/unk_02095E98.inc @@ -1,5 +1,5 @@ .public sub_0201A954 -.public sub_02022974 +.public GF_AssertFail .public sub_020318EC .public sub_02032798 .public sub_02035A3C diff --git a/asm/include/unk_02097B18.inc b/asm/include/unk_02097B18.inc index d1f9756c0f..fa3ab86825 100644 --- a/asm/include/unk_02097B18.inc +++ b/asm/include/unk_02097B18.inc @@ -32,7 +32,7 @@ .public sub_0201E530 .public sub_0201FF0C .public sub_0201FF74 -.public sub_02022974 +.public GF_AssertFail .public sub_02024034 .public sub_020242C4 .public sub_0202440C diff --git a/asm/include/unk_020986CC.inc b/asm/include/unk_020986CC.inc index d3e929764e..78a96b4f11 100644 --- a/asm/include/unk_020986CC.inc +++ b/asm/include/unk_020986CC.inc @@ -1 +1 @@ -.public sub_02022974 +.public GF_AssertFail diff --git a/asm/include/unk_02098700.inc b/asm/include/unk_02098700.inc index 01e899f122..5aec1ac531 100644 --- a/asm/include/unk_02098700.inc +++ b/asm/include/unk_02098700.inc @@ -3,7 +3,7 @@ .public sub_0200723C .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_020988C8 .public sub_020988D8 .public sub_020988E8 diff --git a/asm/include/unk_02098FFC.inc b/asm/include/unk_02098FFC.inc index a8ce4f0dc5..b17a5d1473 100644 --- a/asm/include/unk_02098FFC.inc +++ b/asm/include/unk_02098FFC.inc @@ -26,7 +26,7 @@ .public sub_02021AA0 .public sub_02021D6C .public sub_02021E90 -.public sub_02022974 +.public GF_AssertFail .public sub_02099058 .public sub_02099118 .public sub_020993A8 diff --git a/asm/include/unk_020996D0.inc b/asm/include/unk_020996D0.inc index 6376d08eb8..a14ab07b04 100644 --- a/asm/include/unk_020996D0.inc +++ b/asm/include/unk_020996D0.inc @@ -1,3 +1,3 @@ -.public sub_02022974 +.public GF_AssertFail .public sub_020996D4 .public sub_0209972C diff --git a/asm/include/unk_02099D44.inc b/asm/include/unk_02099D44.inc index b107588f25..3a3fae7530 100644 --- a/asm/include/unk_02099D44.inc +++ b/asm/include/unk_02099D44.inc @@ -1,3 +1,3 @@ -.public sub_02022974 +.public GF_AssertFail .public MIi_CpuCopy32 .public MIi_CpuCopyFast diff --git a/asm/include/unk_0209B6F8.inc b/asm/include/unk_0209B6F8.inc index 53187d7aa4..dc6f6a0384 100644 --- a/asm/include/unk_0209B6F8.inc +++ b/asm/include/unk_0209B6F8.inc @@ -8,7 +8,7 @@ .public sub_02006840 .public sub_02006844 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_0209B8C8 .public sub_0209B8D8 .public sub_0209B8E8 diff --git a/asm/include/unk_0209BDF8.inc b/asm/include/unk_0209BDF8.inc index f4379f8485..1fb039e642 100644 --- a/asm/include/unk_0209BDF8.inc +++ b/asm/include/unk_0209BDF8.inc @@ -1,6 +1,6 @@ .public sub_02018144 .public sub_020181C4 -.public sub_02022974 +.public GF_AssertFail .public sub_020318EC .public sub_02032798 .public sub_02032EE8 diff --git a/asm/ov100_021D0D80.s b/asm/ov100_021D0D80.s index 591d61ef25..fca492091b 100644 --- a/asm/ov100_021D0D80.s +++ b/asm/ov100_021D0D80.s @@ -212,7 +212,7 @@ _021D0F26: mov r0, #1 pop {r3, r4, r5, pc} _021D0F2A: - bl sub_02022974 + bl GF_AssertFail _021D0F2E: ldr r0, [r4, #0x14] bl sub_0200C7EC @@ -297,7 +297,7 @@ ov100_021D0FA0: ; 0x021D0FA0 bl sub_0200C73C cmp r0, #0 bne _021D0FE8 - bl sub_02022974 + bl GF_AssertFail _021D0FE8: ldr r3, _021D1030 ; =0x021D50F8 add r2, sp, #0 @@ -316,7 +316,7 @@ _021D0FE8: bl sub_0200C7C0 cmp r0, #0 bne _021D1012 - bl sub_02022974 + bl GF_AssertFail _021D1012: ldr r0, [r4, #4] ldr r1, [r4, #8] @@ -324,7 +324,7 @@ _021D1012: bl sub_0200CB30 cmp r0, #0 bne _021D1024 - bl sub_02022974 + bl GF_AssertFail _021D1024: add sp, #0x4c pop {r3, r4, r5, r6, pc} diff --git a/asm/ov101_021D0D80.s b/asm/ov101_021D0D80.s index 2ef179d87c..c78e0db913 100644 --- a/asm/ov101_021D0D80.s +++ b/asm/ov101_021D0D80.s @@ -1480,7 +1480,7 @@ ov101_021D1998: ; 0x021D1998 bl sub_02018144 add r4, r0, #0 bne _021D19AC - bl sub_02022974 + bl GF_AssertFail _021D19AC: add r0, r4, #0 mov r1, #0 @@ -1538,7 +1538,7 @@ _021D1A08: add r5, r0, #0 cmp r5, #0 bne _021D1A12 - bl sub_02022974 + bl GF_AssertFail _021D1A12: ldr r0, _021D1A24 ; =0x00000438 add r1, r6, #0 diff --git a/asm/ov101_021D1A28.s b/asm/ov101_021D1A28.s index 151c9e36ce..a46863d40b 100644 --- a/asm/ov101_021D1A28.s +++ b/asm/ov101_021D1A28.s @@ -935,7 +935,7 @@ ov101_021D20FC: ; 0x021D20FC ldr r0, [r4, #0x50] cmp r0, #6 blt _021D210A - bl sub_02022974 + bl GF_AssertFail _021D210A: mov r0, #0x19 str r0, [r4, #0] @@ -951,7 +951,7 @@ ov101_021D2114: ; 0x021D2114 ldr r0, [r4, #0x50] cmp r0, #6 blt _021D2122 - bl sub_02022974 + bl GF_AssertFail _021D2122: mov r0, #0x1c str r0, [r4, #0] @@ -1633,7 +1633,7 @@ ov101_021D2628: ; 0x021D2628 str r0, [r4, #0x10] cmp r0, #1 bge _021D263A - bl sub_02022974 + bl GF_AssertFail _021D263A: add r0, r4, #0 mov r1, #0 @@ -2173,7 +2173,7 @@ ov101_021D2A44: ; 0x021D2A44 sub r0, r0, #1 str r0, [r4, #0x10] beq _021D2A54 - bl sub_02022974 + bl GF_AssertFail _021D2A54: ldr r0, [r4, #0x2c] cmp r0, #1 @@ -2686,7 +2686,7 @@ _021D2DB0: bl ov101_021D2E58 pop {r3, pc} _021D2DB6: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -4039,7 +4039,7 @@ _021D37B0: add r5, r5, #1 cmp r5, #0x15 ble _021D37A0 - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} _021D37BC: cmp r1, #0 @@ -4064,7 +4064,7 @@ _021D37DE: add r5, r5, #1 cmp r5, #0x15 ble _021D37CC - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} _021D37EA: mov r5, #1 @@ -4081,7 +4081,7 @@ _021D37FE: add r5, r5, #1 cmp r5, #0x15 ble _021D37EC - bl sub_02022974 + bl GF_AssertFail b _021D3828 _021D380A: mov r5, #1 @@ -4098,9 +4098,9 @@ _021D381E: add r5, r5, #1 cmp r5, #0x15 ble _021D380C - bl sub_02022974 + bl GF_AssertFail _021D3828: - bl sub_02022974 + bl GF_AssertFail _021D382C: pop {r4, r5, r6, pc} ; .align 2, 0 @@ -4138,7 +4138,7 @@ _021D3864: add r5, r5, #1 cmp r5, #0x15 blt _021D3852 - bl sub_02022974 + bl GF_AssertFail _021D386E: ldr r0, [r6, #0x10] cmp r0, #0 @@ -4163,7 +4163,7 @@ _021D3892: add r5, r5, #1 cmp r5, #0x15 blt _021D3880 - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _021D389E: mov r5, #0 @@ -4180,7 +4180,7 @@ _021D38B2: add r5, r5, #1 cmp r5, #0x15 ble _021D38A0 - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _021D38BE: mov r5, #0 @@ -4197,9 +4197,9 @@ _021D38D2: add r5, r5, #1 cmp r5, #0x15 ble _021D38C0 - bl sub_02022974 + bl GF_AssertFail _021D38DC: - bl sub_02022974 + bl GF_AssertFail _021D38E0: pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -4504,7 +4504,7 @@ _021D3ADC: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021D3AE4: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -5535,7 +5535,7 @@ _021D4292: ldr r0, _021D42C4 ; =0x021D9568 ldr r0, [r0, r1] str r0, [r5, #0x18] - bl sub_02022974 + bl GF_AssertFail add sp, #8 pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -5618,7 +5618,7 @@ _021D4348: mov r1, #1 lsl r0, r0, #2 str r1, [r6, r0] - bl sub_02022974 + bl GF_AssertFail add sp, #8 pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -5714,7 +5714,7 @@ _021D43F6: str r1, [r4, r0] pop {r3, r4, r5, pc} _021D440E: - bl sub_02022974 + bl GF_AssertFail mov r0, #2 ldr r1, [r4, #0x74] lsl r0, r0, #8 @@ -5930,7 +5930,7 @@ _021D459C: add r2, #0x10 cmp r1, #9 blt _021D456C - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} ; .align 2, 0 @@ -6146,7 +6146,7 @@ ov101_021D4714: ; 0x021D4714 ldr r6, [r7, #0x48] cmp r6, #0 bne _021D4724 - bl sub_02022974 + bl GF_AssertFail _021D4724: mov r4, #0 _021D4726: @@ -6173,7 +6173,7 @@ _021D4740: str r0, [r5, #0x18] b _021D4758 _021D4754: - bl sub_02022974 + bl GF_AssertFail _021D4758: add r4, r4, #1 lsr r6, r6, #1 @@ -7688,7 +7688,7 @@ ov101_021D5200: ; 0x021D5200 ldr r0, [r4, r0] cmp r0, #0 beq _021D521E - bl sub_02022974 + bl GF_AssertFail _021D521E: str r4, [sp] mov r0, #0x8f @@ -8526,7 +8526,7 @@ ov101_021D57EC: ; 0x021D57EC beq _021D580E cmp r4, #2 beq _021D5806 - bl sub_02022974 + bl GF_AssertFail _021D5806: ldr r1, [r5, #0] mov r0, #1 @@ -8566,7 +8566,7 @@ _021D5836: add r0, r2, #0 pop {r3, pc} _021D5840: - bl sub_02022974 + bl GF_AssertFail mov r0, #4 pop {r3, pc} thumb_func_end ov101_021D5814 @@ -8602,7 +8602,7 @@ _021D5862: _021D5870: cmp r4, #3 blt _021D5878 - bl sub_02022974 + bl GF_AssertFail _021D5878: lsl r0, r4, #2 add r0, r5, r0 @@ -8757,7 +8757,7 @@ ov101_021D597C: ; 0x021D597C ldr r5, [r0, #0x48] cmp r4, #6 bne _021D598A - bl sub_02022974 + bl GF_AssertFail _021D598A: ldr r3, _021D59A8 ; =0x021D9550 lsl r2, r4, #2 diff --git a/asm/ov101_021D59AC.s b/asm/ov101_021D59AC.s index 643566db1a..559a19e748 100644 --- a/asm/ov101_021D59AC.s +++ b/asm/ov101_021D59AC.s @@ -1271,7 +1271,7 @@ ov101_021D630C: ; 0x021D630C ldr r4, [r6, #0x38] cmp r5, #5 blt _021D631C - bl sub_02022974 + bl GF_AssertFail _021D631C: mov r1, #2 mov r2, #0x45 @@ -1316,7 +1316,7 @@ _021D631C: bl sub_0200DA04 cmp r0, #0 bne _021D6380 - bl sub_02022974 + bl GF_AssertFail _021D6380: ldr r0, _021D63A0 ; =ov101_021D63E8 ldr r2, _021D639C ; =0x00000101 @@ -1324,7 +1324,7 @@ _021D6380: bl sub_0200DA3C cmp r0, #0 bne _021D6392 - bl sub_02022974 + bl GF_AssertFail _021D6392: pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -1698,7 +1698,7 @@ ov101_021D65F4: ; 0x021D65F4 bl sub_0200DA04 cmp r0, #0 bne _021D665C - bl sub_02022974 + bl GF_AssertFail _021D665C: ldr r0, _021D6678 ; =ov101_021D65CC ldr r2, _021D6674 ; =0x00000101 @@ -1706,7 +1706,7 @@ _021D665C: bl sub_0200DA3C cmp r0, #0 bne _021D666E - bl sub_02022974 + bl GF_AssertFail _021D666E: pop {r3, r4, r5, pc} ; .align 2, 0 @@ -1812,7 +1812,7 @@ ov101_021D66D0: ; 0x021D66D0 bl sub_0200DA04 cmp r0, #0 bne _021D6740 - bl sub_02022974 + bl GF_AssertFail _021D6740: ldr r0, _021D6760 ; =ov101_021D66A8 ldr r2, _021D675C ; =0x00000101 @@ -1820,7 +1820,7 @@ _021D6740: bl sub_0200DA3C cmp r0, #0 bne _021D6752 - bl sub_02022974 + bl GF_AssertFail _021D6752: pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -2653,7 +2653,7 @@ ov101_021D6D68: ; 0x021D6D68 bl sub_0200DA04 cmp r0, #0 bne _021D6DD0 - bl sub_02022974 + bl GF_AssertFail _021D6DD0: ldr r0, _021D6DEC ; =ov101_021D6D3C ldr r2, _021D6DE8 ; =0x00000101 @@ -2661,7 +2661,7 @@ _021D6DD0: bl sub_0200DA3C cmp r0, #0 bne _021D6DE2 - bl sub_02022974 + bl GF_AssertFail _021D6DE2: pop {r3, r4, r5, pc} ; .align 2, 0 @@ -4466,7 +4466,7 @@ _021D7B60: ldr r0, [r4, #0x1c] cmp r0, #5 blt _021D7B6A - bl sub_02022974 + bl GF_AssertFail _021D7B6A: add r0, r4, #0 bl ov101_021D7D94 @@ -4840,7 +4840,7 @@ _021D7E16: bl sub_0200DA04 cmp r0, #0 bne _021D7E28 - bl sub_02022974 + bl GF_AssertFail _021D7E28: ldr r0, _021D7E44 ; =ov101_021D7D6C ldr r2, _021D7E40 ; =0x00000101 @@ -4848,7 +4848,7 @@ _021D7E28: bl sub_0200DA3C cmp r0, #0 bne _021D7E3A - bl sub_02022974 + bl GF_AssertFail _021D7E3A: pop {r3, r4, r5, pc} ; .align 2, 0 diff --git a/asm/ov101_021D7E48.s b/asm/ov101_021D7E48.s index aef8864048..14628d339f 100644 --- a/asm/ov101_021D7E48.s +++ b/asm/ov101_021D7E48.s @@ -23,7 +23,7 @@ ov101_021D7E48: ; 0x021D7E48 bl sub_02018144 add r4, r0, #0 bne _021D7E6C - bl sub_02022974 + bl GF_AssertFail _021D7E6C: ldr r0, [sp] add r1, r4, #0 @@ -393,7 +393,7 @@ _021D813C: cmp r1, r5 blo _021D8102 _021D8144: - bl sub_02022974 + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov101_021D80E4 @@ -424,7 +424,7 @@ _021D8170: cmp r4, r2 blo _021D815E _021D8178: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} ; .align 2, 0 thumb_func_end ov101_021D814C @@ -455,7 +455,7 @@ _021D81A4: cmp r4, r2 blo _021D8192 _021D81AC: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} ; .align 2, 0 thumb_func_end ov101_021D8180 @@ -514,7 +514,7 @@ _021D8210: cmp r1, r5 blo _021D81D2 _021D8218: - bl sub_02022974 + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} thumb_func_end ov101_021D81B4 @@ -545,7 +545,7 @@ _021D8244: cmp r4, r2 blo _021D8232 _021D824C: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} ; .align 2, 0 thumb_func_end ov101_021D8220 @@ -576,7 +576,7 @@ _021D8278: cmp r4, r2 blo _021D8266 _021D8280: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} ; .align 2, 0 thumb_func_end ov101_021D8254 @@ -633,7 +633,7 @@ _021D82E0: cmp r1, r5 blo _021D82A6 _021D82E8: - bl sub_02022974 + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov101_021D8288 @@ -690,7 +690,7 @@ _021D8348: cmp r1, r5 blo _021D830E _021D8350: - bl sub_02022974 + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov101_021D82F0 @@ -947,7 +947,7 @@ _021D8510: str r0, [r4, #4] cmp r0, #0 bne _021D853E - bl sub_02022974 + bl GF_AssertFail _021D853E: add sp, #0x70 pop {r3, r4, r5, r6, r7, pc} diff --git a/asm/ov104_0222DCE0.s b/asm/ov104_0222DCE0.s index bc55a6e3c1..b639d2aa3f 100644 --- a/asm/ov104_0222DCE0.s +++ b/asm/ov104_0222DCE0.s @@ -936,7 +936,7 @@ ov104_0222E3E4: ; 0x0222E3E4 str r0, [sp, #0x90] cmp r0, #6 ble _0222E3FC - bl sub_02022974 + bl GF_AssertFail _0222E3FC: ldr r0, [sp, #0x90] mov r4, #0 diff --git a/asm/ov104_0222E63C.s b/asm/ov104_0222E63C.s index 28133ee803..187e64c434 100644 --- a/asm/ov104_0222E63C.s +++ b/asm/ov104_0222E63C.s @@ -123,7 +123,7 @@ ov104_0222E710: ; 0x0222E710 ldrsb r0, [r4, r0] cmp r0, #0 beq _0222E720 - bl sub_02022974 + bl GF_AssertFail _0222E720: ldr r0, [r4, #0x44] bl sub_0200B3F0 @@ -229,7 +229,7 @@ _0222E7EC: add r4, r4, #4 cmp r3, #8 blt _0222E7D2 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} thumb_func_end ov104_0222E7CC diff --git a/asm/ov104_0222E930.s b/asm/ov104_0222E930.s index 08f8415c8b..4df21898a7 100644 --- a/asm/ov104_0222E930.s +++ b/asm/ov104_0222E930.s @@ -117,7 +117,7 @@ _0222E9CE: ldr r0, [r4, #0x74] cmp r1, r0 blo _0222E9E6 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 strb r0, [r4, #0x19] pop {r4, pc} diff --git a/asm/ov104_0222EA90.s b/asm/ov104_0222EA90.s index 5371726a4f..b3601a95a1 100644 --- a/asm/ov104_0222EA90.s +++ b/asm/ov104_0222EA90.s @@ -117,7 +117,7 @@ _0222EB40: ldrb r0, [r0, r1] pop {r3, pc} _0222EB4A: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} nop diff --git a/asm/ov104_0222ECE8.s b/asm/ov104_0222ECE8.s index f58f893cf7..c7216df6b5 100644 --- a/asm/ov104_0222ECE8.s +++ b/asm/ov104_0222ECE8.s @@ -296,7 +296,7 @@ ov104_0222EED8: ; 0x0222EED8 add r4, r1, #0 cmp r2, r0 ble _0222EEEA - bl sub_02022974 + bl GF_AssertFail _0222EEEA: ldr r0, _0222EEF4 ; =0x00000984 add r1, r4, r0 @@ -1605,7 +1605,7 @@ ov104_0222F84C: ; 0x0222F84C add r4, r1, #0 cmp r2, r0 ble _0222F85E - bl sub_02022974 + bl GF_AssertFail _0222F85E: mov r0, #0x61 lsl r0, r0, #4 @@ -2087,7 +2087,7 @@ ov104_0222FBC4: ; 0x0222FBC4 add r4, r1, #0 cmp r2, r0 ble _0222FBD6 - bl sub_02022974 + bl GF_AssertFail _0222FBD6: ldr r0, _0222FBE0 ; =0x00000674 add r1, r4, r0 diff --git a/asm/ov104_0222FBE4.s b/asm/ov104_0222FBE4.s index 97297f33ba..764aafacc1 100644 --- a/asm/ov104_0222FBE4.s +++ b/asm/ov104_0222FBE4.s @@ -16,7 +16,7 @@ ov104_0222FBE4: ; 0x0222FBE4 bl ov104_0222FC14 add r4, r0, #0 bne _0222FBFC - bl sub_02022974 + bl GF_AssertFail _0222FBFC: add r0, r4, #0 pop {r4, pc} @@ -93,7 +93,7 @@ _0222FC70: mov r0, #0 pop {r3, pc} _0222FC7A: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} nop @@ -1253,7 +1253,7 @@ ov104_022304C8: ; 0x022304C8 ldr r0, [sp] cmp r0, #0 bne _022304FC - bl sub_02022974 + bl GF_AssertFail _022304FC: ldr r0, [sp] add r1, r5, #0 @@ -1289,7 +1289,7 @@ ov104_0223050C: ; 0x0223050C str r0, [sp, #8] cmp r0, #0 bne _0223053E - bl sub_02022974 + bl GF_AssertFail _0223053E: add r0, r4, #0 add r0, #0x59 @@ -1339,7 +1339,7 @@ ov104_0223056C: ; 0x0223056C ldr r0, [r5, #0x38] cmp r0, #0 beq _022305A0 - bl sub_02022974 + bl GF_AssertFail _022305A0: ldr r0, _022305B0 ; =ov104_02232B78 ldr r2, _022305B4 ; =0x0000EAC4 @@ -1558,7 +1558,7 @@ ov104_02230728: ; 0x02230728 bl ov104_0223D370 add r4, r0, #0 bne _02230754 - bl sub_02022974 + bl GF_AssertFail _02230754: add r0, r4, #0 add r1, r5, #0 @@ -1582,7 +1582,7 @@ ov104_02230760: ; 0x02230760 bl ov104_0223D370 add r4, r0, #0 bne _02230784 - bl sub_02022974 + bl GF_AssertFail _02230784: ldr r0, [r4, #0] mov r1, #1 @@ -1610,7 +1610,7 @@ ov104_02230790: ; 0x02230790 bl ov104_0223D370 add r4, r0, #0 bne _022307BE - bl sub_02022974 + bl GF_AssertFail _022307BE: cmp r5, #0 ldr r0, [r4, #0] @@ -1728,7 +1728,7 @@ ov104_0223088C: ; 0x0223088C ldr r7, [r6, #0] cmp r4, #7 ble _0223089E - bl sub_02022974 + bl GF_AssertFail _0223089E: ldr r0, [r7, #0x34] lsl r1, r4, #1 @@ -1986,7 +1986,7 @@ _02230A72: _02230A74: b _02230B4C _02230A76: - bl sub_02022974 + bl GF_AssertFail b _02230B4C _02230A7C: cmp r1, #3 @@ -2012,7 +2012,7 @@ _02230A9C: mov r4, #0x14 b _02230B4C _02230AA0: - bl sub_02022974 + bl GF_AssertFail b _02230B4C _02230AA6: cmp r1, #3 @@ -2038,7 +2038,7 @@ _02230AC6: mov r4, #0x17 b _02230B4C _02230ACA: - bl sub_02022974 + bl GF_AssertFail b _02230B4C _02230AD0: cmp r1, #3 @@ -2064,7 +2064,7 @@ _02230AF0: mov r4, #0x1d b _02230B4C _02230AF4: - bl sub_02022974 + bl GF_AssertFail b _02230B4C _02230AFA: cmp r1, #3 @@ -2090,7 +2090,7 @@ _02230B1A: mov r4, #0x1a b _02230B4C _02230B1E: - bl sub_02022974 + bl GF_AssertFail b _02230B4C _02230B24: cmp r1, #3 @@ -2116,7 +2116,7 @@ _02230B44: mov r4, #0x20 b _02230B4C _02230B48: - bl sub_02022974 + bl GF_AssertFail _02230B4C: add r0, r4, #0 pop {r4, pc} @@ -4297,7 +4297,7 @@ ov104_02231BD4: ; 0x02231BD4 add r5, #0xa4 cmp r0, #0 beq _02231BF6 - bl sub_02022974 + bl GF_AssertFail ldr r0, [r5, #0] bl sub_0200DA58 _02231BF6: @@ -4376,7 +4376,7 @@ ov104_02231C70: ; 0x02231C70 add r4, #0xb0 cmp r0, #0 beq _02231C92 - bl sub_02022974 + bl GF_AssertFail ldr r0, [r4, #0] bl sub_0200DA58 _02231C92: diff --git a/asm/ov104_02231F74.s b/asm/ov104_02231F74.s index 28d2d36a6b..37ad365679 100644 --- a/asm/ov104_02231F74.s +++ b/asm/ov104_02231F74.s @@ -152,7 +152,7 @@ ov104_02232088: ; 0x02232088 ldrb r0, [r0] cmp r0, #1 beq _02232098 - bl sub_02022974 + bl GF_AssertFail _02232098: add r0, r4, #0 add r0, #0x64 @@ -1667,7 +1667,7 @@ _02232BFC: bl ov63_0222D008 b _02232C0C _02232C08: - bl sub_02022974 + bl GF_AssertFail _02232C0C: ldr r0, [r5, #0xc] add sp, #8 @@ -1959,7 +1959,7 @@ _02232E5E: ldr r0, [r5, r4] cmp r0, #0 beq _02232E76 - bl sub_02022974 + bl GF_AssertFail _02232E76: str r6, [r5, r4] add sp, #0x7c @@ -2078,7 +2078,7 @@ ov104_02232F4C: ; 0x02232F4C str r3, [sp, #0xc] cmp r4, #8 blt _02232F60 - bl sub_02022974 + bl GF_AssertFail _02232F60: add r0, r7, #0 bl sub_02079D80 diff --git a/asm/ov104_022339B4.s b/asm/ov104_022339B4.s index 4d14a6dd46..0715b2330d 100644 --- a/asm/ov104_022339B4.s +++ b/asm/ov104_022339B4.s @@ -928,7 +928,7 @@ ov104_02234130: ; 0x02234130 push {r3, lr} cmp r1, #6 blo _0223413E - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} _0223413E: diff --git a/asm/ov104_022361B4.s b/asm/ov104_022361B4.s index d04f865108..ad0dc46a81 100644 --- a/asm/ov104_022361B4.s +++ b/asm/ov104_022361B4.s @@ -785,7 +785,7 @@ ov104_02236834: ; 0x02236834 push {r3, lr} cmp r1, #6 blo _02236842 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} _02236842: @@ -1739,14 +1739,14 @@ ov104_02236FC0: ; 0x02236FC0 ldr r0, [r0, #0] cmp r0, #0 beq _02236FDC - bl sub_02022974 + bl GF_AssertFail _02236FDC: add r0, r5, #0 add r0, #0xac ldr r0, [r0, #0] cmp r0, #0 beq _02236FEA - bl sub_02022974 + bl GF_AssertFail _02236FEA: ldrb r0, [r6, #0x10] bl ov104_0223BA14 @@ -1876,7 +1876,7 @@ ov104_022370E0: ; 0x022370E0 ldr r0, [r0, #0] cmp r0, #0 bne _022370FC - bl sub_02022974 + bl GF_AssertFail _022370FC: add r0, r5, #0 add r0, #0xa8 @@ -1894,14 +1894,14 @@ _02237114: ldr r0, [r0, #0] cmp r0, #0 bne _02237122 - bl sub_02022974 + bl GF_AssertFail _02237122: add r0, r5, #0 add r0, #0xac ldr r0, [r0, #0] cmp r0, #0 bne _02237130 - bl sub_02022974 + bl GF_AssertFail _02237130: bl sub_0203608C cmp r0, #0 @@ -1957,7 +1957,7 @@ ov104_02237180: ; 0x02237180 ldr r0, [r0, #0] cmp r0, #0 bne _0223719E - bl sub_02022974 + bl GF_AssertFail _0223719E: ldr r0, [r5, #4] bl sub_0203068C @@ -1988,14 +1988,14 @@ _022371DA: ldr r0, [r0, #0] cmp r0, #0 bne _022371E8 - bl sub_02022974 + bl GF_AssertFail _022371E8: add r0, r4, #0 add r0, #0xac ldr r0, [r0, #0] cmp r0, #0 bne _022371F6 - bl sub_02022974 + bl GF_AssertFail _022371F6: bl sub_0203608C cmp r0, #0 diff --git a/asm/ov104_02237DD8.s b/asm/ov104_02237DD8.s index c973d04532..1f7b0d9e2d 100644 --- a/asm/ov104_02237DD8.s +++ b/asm/ov104_02237DD8.s @@ -572,7 +572,7 @@ ov104_02238264: ; 0x02238264 push {r3, lr} cmp r1, #6 blo _02238272 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} _02238272: @@ -2290,7 +2290,7 @@ _02238F62: add r6, r0, #3 cmp r6, #0x64 bls _02238F80 - bl sub_02022974 + bl GF_AssertFail mov r6, #0x64 _02238F80: add r0, r5, #0 diff --git a/asm/ov104_02239130.s b/asm/ov104_02239130.s index d8fd3f4472..0388198b2b 100644 --- a/asm/ov104_02239130.s +++ b/asm/ov104_02239130.s @@ -164,7 +164,7 @@ _02239266: strh r0, [r4] b _02239270 _0223926C: - bl sub_02022974 + bl GF_AssertFail _02239270: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -353,7 +353,7 @@ ov104_0223939C: ; 0x0223939C bl ov104_0223A734 b _022393DA _022393D6: - bl sub_02022974 + bl GF_AssertFail _022393DA: bl sub_0203608C ldr r1, _022393FC ; =0x0000083E @@ -457,7 +457,7 @@ _02239480: strh r0, [r4] b _022394A0 _0223949C: - bl sub_02022974 + bl GF_AssertFail _022394A0: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} diff --git a/asm/ov104_02239C58.s b/asm/ov104_02239C58.s index e9902b10d6..dc060ee38a 100644 --- a/asm/ov104_02239C58.s +++ b/asm/ov104_02239C58.s @@ -214,7 +214,7 @@ _02239DC2: strb r1, [r0] b _02239DD8 _02239DD4: - bl sub_02022974 + bl GF_AssertFail _02239DD8: add r0, r5, #0 add r0, #0xa8 @@ -383,7 +383,7 @@ _02239EDA: strb r1, [r0] b _02239F20 _02239F1C: - bl sub_02022974 + bl GF_AssertFail _02239F20: mov r3, #0 str r3, [sp] diff --git a/asm/ov104_0223A0C4.s b/asm/ov104_0223A0C4.s index 16cd37cdf5..b508079fca 100644 --- a/asm/ov104_0223A0C4.s +++ b/asm/ov104_0223A0C4.s @@ -70,7 +70,7 @@ ov104_0223A118: ; 0x0223A118 ldrb r0, [r0, #0x10] cmp r0, #4 bls _0223A144 - bl sub_02022974 + bl GF_AssertFail _0223A144: add r0, sp, #0x88 ldrb r6, [r0, #0x10] @@ -934,13 +934,13 @@ _0223A7B6: bl sub_02032EE8 add r5, r0, #0 bne _0223A7C4 - bl sub_02022974 + bl GF_AssertFail _0223A7C4: mov r0, #1 bl sub_02032EE8 add r4, r0, #0 bne _0223A7D2 - bl sub_02022974 + bl GF_AssertFail _0223A7D2: add r0, r5, #0 bl sub_02025FCC diff --git a/asm/ov104_0223A7F4.s b/asm/ov104_0223A7F4.s index 668f3ef8e8..b50a503aa5 100644 --- a/asm/ov104_0223A7F4.s +++ b/asm/ov104_0223A7F4.s @@ -136,7 +136,7 @@ _0223A8C6: _0223A8D4: cmp r2, r4 blt _0223A8DE - bl sub_02022974 + bl GF_AssertFail sub r2, r4, #1 _0223A8DE: ldr r0, _0223A8EC ; =0x02241AB8 @@ -187,7 +187,7 @@ ov104_0223A918: ; 0x0223A918 str r3, [sp, #8] cmp r0, #6 ble _0223A936 - bl sub_02022974 + bl GF_AssertFail _0223A936: ldr r0, [sp, #0xa0] mov r4, #0 diff --git a/asm/ov104_0223B6F4.s b/asm/ov104_0223B6F4.s index d8bf21bfad..39f429de53 100644 --- a/asm/ov104_0223B6F4.s +++ b/asm/ov104_0223B6F4.s @@ -134,7 +134,7 @@ _0223B7CE: mov r0, #4 pop {r3, pc} _0223B7D2: - bl sub_02022974 + bl GF_AssertFail mov r0, #3 pop {r3, pc} ; .align 2, 0 @@ -168,7 +168,7 @@ _0223B802: mov r0, #4 pop {r3, pc} _0223B806: - bl sub_02022974 + bl GF_AssertFail mov r0, #3 pop {r3, pc} ; .align 2, 0 diff --git a/asm/ov104_0223BCBC.s b/asm/ov104_0223BCBC.s index 8b8e99553e..fe5979b068 100644 --- a/asm/ov104_0223BCBC.s +++ b/asm/ov104_0223BCBC.s @@ -134,7 +134,7 @@ _0223BD96: mov r0, #4 pop {r3, pc} _0223BD9A: - bl sub_02022974 + bl GF_AssertFail mov r0, #3 pop {r3, pc} ; .align 2, 0 @@ -168,7 +168,7 @@ _0223BDCA: mov r0, #4 pop {r3, pc} _0223BDCE: - bl sub_02022974 + bl GF_AssertFail mov r0, #3 pop {r3, pc} ; .align 2, 0 diff --git a/asm/ov104_0223C2D4.s b/asm/ov104_0223C2D4.s index 0dc54b52ab..324ba4c3cd 100644 --- a/asm/ov104_0223C2D4.s +++ b/asm/ov104_0223C2D4.s @@ -1396,7 +1396,7 @@ _0223CEFA: ldr r0, [r5, #0x38] cmp r0, #0 beq _0223CF0E - bl sub_02022974 + bl GF_AssertFail _0223CF0E: add r4, r4, #1 add r5, #0x3c @@ -1660,7 +1660,7 @@ _0223D114: _0223D122: cmp r4, #0x18 bne _0223D12A - bl sub_02022974 + bl GF_AssertFail _0223D12A: ldrh r0, [r5] lsl r2, r4, #2 @@ -1735,7 +1735,7 @@ _0223D19A: _0223D1A8: cmp r4, #0x20 bne _0223D1B0 - bl sub_02022974 + bl GF_AssertFail _0223D1B0: mov r0, #6 ldrsh r0, [r5, r0] @@ -1800,7 +1800,7 @@ _0223D210: ldr r0, [r0, #0x38] cmp r0, #0 beq _0223D236 - bl sub_02022974 + bl GF_AssertFail _0223D236: add r0, r4, r5 mov r1, #0 @@ -1854,7 +1854,7 @@ _0223D28C: add r3, #0x3c cmp r1, #0x20 blt _0223D26A - bl sub_02022974 + bl GF_AssertFail _0223D298: pop {r4, r5, r6, pc} ; .align 2, 0 @@ -1882,7 +1882,7 @@ _0223D2B8: add r5, r5, #2 cmp r4, #8 blt _0223D2A4 - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} nop _0223D2C8: .word 0x0000FFFF @@ -1926,7 +1926,7 @@ ov104_0223D2FC: ; 0x0223D2FC add r6, r2, #0 cmp r4, #8 blo _0223D30E - bl sub_02022974 + bl GF_AssertFail _0223D30E: add r7, r5, #0 lsl r0, r4, #2 @@ -1935,7 +1935,7 @@ _0223D30E: ldr r0, [r7, r0] cmp r0, #0 beq _0223D320 - bl sub_02022974 + bl GF_AssertFail _0223D320: ldr r0, [r5, #0x34] ldr r1, [r5, #0x38] @@ -1964,14 +1964,14 @@ ov104_0223D348: ; 0x0223D348 add r5, r0, #0 cmp r4, #8 blo _0223D356 - bl sub_02022974 + bl GF_AssertFail _0223D356: lsl r4, r4, #2 add r5, #0x3c ldr r0, [r5, r4] cmp r0, #0 bne _0223D364 - bl sub_02022974 + bl GF_AssertFail _0223D364: ldr r0, [r5, r4] bl ov104_0223D858 @@ -2298,7 +2298,7 @@ _0223D5BE: add r0, #0x3c cmp r2, #0x20 blt _0223D5B2 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 _0223D5CC: pop {r4, pc} diff --git a/asm/ov104_0223D5D0.s b/asm/ov104_0223D5D0.s index cd4de1b245..323dee432b 100644 --- a/asm/ov104_0223D5D0.s +++ b/asm/ov104_0223D5D0.s @@ -56,7 +56,7 @@ ov104_0223D614: ; 0x0223D614 str r3, [sp, #8] cmp r0, #0 beq _0223D62A - bl sub_02022974 + bl GF_AssertFail _0223D62A: ldrh r0, [r5, #0x20] mov r1, #0x12 @@ -109,7 +109,7 @@ ov104_0223D68C: ; 0x0223D68C ldr r0, [r5, r4] cmp r0, #0 bne _0223D69C - bl sub_02022974 + bl GF_AssertFail _0223D69C: ldr r0, [r5, r4] bl ov104_0223D708 @@ -147,7 +147,7 @@ ov104_0223D6D0: ; 0x0223D6D0 ldr r0, [r5, r4] cmp r0, #0 bne _0223D6E0 - bl sub_02022974 + bl GF_AssertFail _0223D6E0: ldr r0, [r5, r4] pop {r3, r4, r5, pc} @@ -198,7 +198,7 @@ ov104_0223D720: ; 0x0223D720 blx r3 add r4, r0, #0 bne _0223D732 - bl sub_02022974 + bl GF_AssertFail _0223D732: add r0, r4, #0 bl sub_020145B4 @@ -218,7 +218,7 @@ ov104_0223D744: ; 0x0223D744 blx r3 add r4, r0, #0 bne _0223D756 - bl sub_02022974 + bl GF_AssertFail _0223D756: add r0, r4, #0 bl sub_020145F4 diff --git a/asm/ov104_0223D768.s b/asm/ov104_0223D768.s index 9dd7c0cce4..20f2746e1c 100644 --- a/asm/ov104_0223D768.s +++ b/asm/ov104_0223D768.s @@ -18,7 +18,7 @@ ov104_0223D768: ; 0x0223D768 str r3, [sp, #0x18] cmp r0, #4 blo _0223D780 - bl sub_02022974 + bl GF_AssertFail _0223D780: add r1, sp, #0x20 ldrh r2, [r1, #0x10] @@ -78,7 +78,7 @@ ov104_0223D7EC: ; 0x0223D7EC add r5, r0, #0 cmp r4, #4 blo _0223D7FA - bl sub_02022974 + bl GF_AssertFail _0223D7FA: mov r0, #0x34 ldr r1, _0223D824 ; =0x022417D8 @@ -109,7 +109,7 @@ ov104_0223D828: ; 0x0223D828 add r6, r1, #0 cmp r4, #4 blo _0223D838 - bl sub_02022974 + bl GF_AssertFail _0223D838: mov r2, #0x34 ldr r3, _0223D854 ; =0x022417D8 diff --git a/asm/ov104_0223D860.s b/asm/ov104_0223D860.s index 87cc8859af..82b83502b0 100644 --- a/asm/ov104_0223D860.s +++ b/asm/ov104_0223D860.s @@ -170,7 +170,7 @@ _0223D972: strh r0, [r4, #0xa] b _0223D986 _0223D97C: - bl sub_02022974 + bl GF_AssertFail add sp, #8 mov r0, #1 pop {r4, r5, r6, pc} diff --git a/asm/ov104_0223DC7C.s b/asm/ov104_0223DC7C.s index 3201099a96..5be9d14712 100644 --- a/asm/ov104_0223DC7C.s +++ b/asm/ov104_0223DC7C.s @@ -769,7 +769,7 @@ ov104_0223E29C: ; 0x0223E29C ldr r4, [sp, #0xa8] cmp r0, #0 beq _0223E2B6 - bl sub_02022974 + bl GF_AssertFail _0223E2B6: ldr r0, [r7, #0x10] cmp r4, #0 diff --git a/asm/ov104_0223E894.s b/asm/ov104_0223E894.s index 304be46f03..01761793b7 100644 --- a/asm/ov104_0223E894.s +++ b/asm/ov104_0223E894.s @@ -295,7 +295,7 @@ ov104_0223EA84: ; 0x0223EA84 add r7, r3, #0 cmp r0, #0 beq _0223EA9A - bl sub_02022974 + bl GF_AssertFail _0223EA9A: ldr r3, [sp, #0x1c] add r0, r5, #0 @@ -1178,7 +1178,7 @@ ov104_0223F110: ; 0x0223F110 add r7, r3, #0 cmp r5, #0 bne _0223F122 - bl sub_02022974 + bl GF_AssertFail _0223F122: mov r0, #1 str r0, [r5, #8] @@ -1207,7 +1207,7 @@ ov104_0223F150: ; 0x0223F150 push {r4, lr} add r4, r0, #0 bne _0223F15A - bl sub_02022974 + bl GF_AssertFail _0223F15A: ldr r0, [r4, #4] cmp r0, #0 @@ -1278,7 +1278,7 @@ ov104_0223F1B4: ; 0x0223F1B4 ldr r0, [sp] cmp r0, #0 bne _0223F1D8 - bl sub_02022974 + bl GF_AssertFail _0223F1D8: ldr r1, [sp] ldr r3, _0223F248 ; =0x00001820 @@ -1291,7 +1291,7 @@ _0223F1D8: cmp r0, #0 str r0, [r1, #0x1c] bne _0223F1F4 - bl sub_02022974 + bl GF_AssertFail _0223F1F4: ldr r0, [sp] ldr r1, _0223F24C ; =0x00003020 @@ -1346,7 +1346,7 @@ ov104_0223F258: ; 0x0223F258 push {r4, lr} add r4, r0, #0 bne _0223F262 - bl sub_02022974 + bl GF_AssertFail _0223F262: add r0, r4, #0 bl ov104_0223F150 @@ -1366,7 +1366,7 @@ ov104_0223F27C: ; 0x0223F27C push {r4, lr} add r4, r0, #0 bne _0223F286 - bl sub_02022974 + bl GF_AssertFail _0223F286: ldr r0, [r4, #0x1c] bl sub_02013B54 diff --git a/asm/ov105_02241AE0.s b/asm/ov105_02241AE0.s index c7a67c3d18..cfdb401b46 100644 --- a/asm/ov105_02241AE0.s +++ b/asm/ov105_02241AE0.s @@ -7575,10 +7575,10 @@ _022457B4: .word 0x0000035B thumb_func_start ov105_022457B8 ov105_022457B8: ; 0x022457B8 - ldr r3, _022457BC ; =sub_02022974 + ldr r3, _022457BC ; =GF_AssertFail bx r3 ; .align 2, 0 -_022457BC: .word sub_02022974 +_022457BC: .word GF_AssertFail thumb_func_end ov105_022457B8 thumb_func_start ov105_022457C0 @@ -7900,7 +7900,7 @@ _02245A12: mov r3, #0x28 b _02245A20 _02245A18: - bl sub_02022974 + bl GF_AssertFail mov r2, #0 add r3, r2, #0 _02245A20: diff --git a/asm/ov107_02241AE0.s b/asm/ov107_02241AE0.s index 6057e62a2f..bbf628902f 100644 --- a/asm/ov107_02241AE0.s +++ b/asm/ov107_02241AE0.s @@ -6274,7 +6274,7 @@ _02244DBE: add r2, r2, #2 cmp r3, #0x20 blo _02244DB0 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} nop @@ -7324,7 +7324,7 @@ _02245578: bl ov107_02245454 b _0224558E _0224558A: - bl sub_02022974 + bl GF_AssertFail _0224558E: ldr r0, _0224559C ; =0x000005EC bl sub_02005748 diff --git a/asm/ov107_02245EB0.s b/asm/ov107_02245EB0.s index d2a3b6ff16..fa16ddfe14 100644 --- a/asm/ov107_02245EB0.s +++ b/asm/ov107_02245EB0.s @@ -6675,7 +6675,7 @@ ov107_022493CC: ; 0x022493CC mov r6, #2 b _022493EA _022493E6: - bl sub_02022974 + bl GF_AssertFail _022493EA: ldrb r7, [r5, #0x15] add r1, r4, #0 diff --git a/asm/ov107_02249B1C.s b/asm/ov107_02249B1C.s index bfdae14f57..f95e409fc9 100644 --- a/asm/ov107_02249B1C.s +++ b/asm/ov107_02249B1C.s @@ -68,7 +68,7 @@ ov107_02249B8C: ; 0x02249B8C push {r4, lr} add r4, r0, #0 bne _02249B9A - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} _02249B9A: diff --git a/asm/ov108_02241AE0.s b/asm/ov108_02241AE0.s index 18f0d806bc..5a7143221a 100644 --- a/asm/ov108_02241AE0.s +++ b/asm/ov108_02241AE0.s @@ -2405,7 +2405,7 @@ _02242D14: lsr r0, r0, #0x1f b _02242D28 _02242D1E: - bl sub_02022974 + bl GF_AssertFail mov r0, #1 b _02242D28 _02242D26: @@ -2604,7 +2604,7 @@ _02242E70: _02242E8C: cmp r7, #0x32 blt _02242EA0 - bl sub_02022974 + bl GF_AssertFail ldr r0, [sp, #4] mov r1, #0 add r0, r6, r0 @@ -2687,7 +2687,7 @@ _02242F10: _02242F26: cmp r0, #4 blo _02242F30 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 _02242F30: pop {r3, r4, r5, pc} diff --git a/asm/ov109_021D0D80.s b/asm/ov109_021D0D80.s index 23a3fe0e4d..c2791da64d 100644 --- a/asm/ov109_021D0D80.s +++ b/asm/ov109_021D0D80.s @@ -147,7 +147,7 @@ ov109_021D0EB4: ; 0x021D0EB4 bl sub_0201E530 cmp r0, #1 beq _021D0ECA - bl sub_02022974 + bl GF_AssertFail _021D0ECA: add r0, r4, #0 bl ov109_021D31E0 @@ -491,12 +491,12 @@ ov109_021D1124: ; 0x021D1124 ldr r0, [r4, #0x30] cmp r0, #2 bge _021D113C - bl sub_02022974 + bl GF_AssertFail _021D113C: ldr r0, [r4, #0x2c] cmp r0, #0 bne _021D1146 - bl sub_02022974 + bl GF_AssertFail _021D1146: mov r0, #0xa str r0, [r4, #0] @@ -1380,7 +1380,7 @@ _021D1784: ldr r0, [r4, #0] cmp r0, #0 bne _021D178E - bl sub_02022974 + bl GF_AssertFail _021D178E: ldr r1, [r4, #0x1c] asr r0, r1, #0xb @@ -1459,7 +1459,7 @@ _021D1816: ldr r0, [r4, #0] cmp r0, #0 bne _021D1820 - bl sub_02022974 + bl GF_AssertFail _021D1820: ldr r0, [r4, #0x10] add r6, r6, #1 @@ -2915,7 +2915,7 @@ ov109_021D2368: ; 0x021D2368 bl sub_0200C7C0 cmp r0, #0 bne _021D23D8 - bl sub_02022974 + bl GF_AssertFail _021D23D8: ldr r1, _021D23FC ; =0x00000D94 add r2, sp, #0 @@ -2925,7 +2925,7 @@ _021D23D8: bl sub_0200CB30 cmp r0, #0 bne _021D23EE - bl sub_02022974 + bl GF_AssertFail _021D23EE: add sp, #0x4c pop {r3, r4, pc} @@ -4772,7 +4772,7 @@ ov109_021D31A8: ; 0x021D31A8 ldr r0, [r4, r1] cmp r0, #0 bne _021D31D4 - bl sub_02022974 + bl GF_AssertFail _021D31D4: pop {r4, pc} nop @@ -4810,7 +4810,7 @@ _021D3206: add r3, #0x20 cmp r2, #5 blt _021D31F8 - bl sub_02022974 + bl GF_AssertFail pop {r3, pc} ; .align 2, 0 _021D3214: .word 0x00000AB4 @@ -4954,7 +4954,7 @@ ov109_021D32DC: ; 0x021D32DC ldr r0, [r4, r1] cmp r0, #0 bne _021D3304 - bl sub_02022974 + bl GF_AssertFail _021D3304: pop {r4, pc} nop @@ -5011,7 +5011,7 @@ _021D335C: add r0, #0x14 cmp r3, #5 blt _021D334E - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} nop _021D336C: .word 0x00000B54 @@ -5126,7 +5126,7 @@ ov109_021D3414: ; 0x021D3414 ldr r0, [r4, r1] cmp r0, #0 bne _021D343C - bl sub_02022974 + bl GF_AssertFail _021D343C: pop {r4, pc} nop @@ -5183,7 +5183,7 @@ _021D3494: add r0, #0x18 cmp r3, #5 blt _021D3486 - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} nop _021D34A4: .word 0x00000BB8 @@ -5331,7 +5331,7 @@ _021D3592: ldr r0, [r4, r1] cmp r0, #0 bne _021D35B2 - bl sub_02022974 + bl GF_AssertFail _021D35B2: pop {r4, pc} ; .align 2, 0 @@ -5359,7 +5359,7 @@ ov109_021D35CC: ; 0x021D35CC ldr r0, [r4, #4] cmp r0, #0 beq _021D35DE - bl sub_02022974 + bl GF_AssertFail _021D35DE: mov r0, #1 str r0, [r4, #8] @@ -5508,7 +5508,7 @@ _021D369A: bl sub_0200D9E8 add r4, r0, #0 bne _021D36F6 - bl sub_02022974 + bl GF_AssertFail _021D36F6: add r0, r4, #0 add sp, #0x34 @@ -5626,7 +5626,7 @@ ov109_021D379C: ; 0x021D379C ldr r0, [r4, r1] cmp r0, #0 bne _021D37D0 - bl sub_02022974 + bl GF_AssertFail _021D37D0: pop {r4, pc} nop @@ -5663,7 +5663,7 @@ ov109_021D37FC: ; 0x021D37FC ldrh r0, [r4, #2] cmp r0, #0 beq _021D380C - bl sub_02022974 + bl GF_AssertFail _021D380C: mov r0, #1 strh r0, [r4, #2] @@ -5757,7 +5757,7 @@ ov109_021D3884: ; 0x021D3884 ldr r0, [r4, r1] cmp r0, #0 bne _021D38AE - bl sub_02022974 + bl GF_AssertFail _021D38AE: pop {r4, pc} ; .align 2, 0 @@ -5788,12 +5788,12 @@ ov109_021D38CC: ; 0x021D38CC add r4, r1, r0 cmp r2, #5 blt _021D38E2 - bl sub_02022974 + bl GF_AssertFail _021D38E2: ldr r0, [r4, #0] cmp r0, #0 beq _021D38EC - bl sub_02022974 + bl GF_AssertFail _021D38EC: mov r0, #1 str r0, [r4, #0] @@ -5915,7 +5915,7 @@ ov109_021D3990: ; 0x021D3990 bl sub_0200D9E8 cmp r0, #0 bne _021D39C8 - bl sub_02022974 + bl GF_AssertFail _021D39C8: add sp, #8 pop {r3, r4, r5, pc} @@ -6049,7 +6049,7 @@ ov109_021D3A94: ; 0x021D3A94 add r4, r0, #0 cmp r1, #0x20 blo _021D3AA0 - bl sub_02022974 + bl GF_AssertFail _021D3AA0: add r0, r4, #0 add r0, #0xac diff --git a/asm/ov109_021D3D50.s b/asm/ov109_021D3D50.s index 43a450f663..e66520e462 100644 --- a/asm/ov109_021D3D50.s +++ b/asm/ov109_021D3D50.s @@ -48,7 +48,7 @@ _021D3D6C: bl sub_02006C24 add r7, r0, #0 bne _021D3DAE - bl sub_02022974 + bl GF_AssertFail _021D3DAE: ldr r1, _021D3EA0 ; =0x00004AB0 add r0, r4, #0 @@ -842,7 +842,7 @@ ov109_021D441C: ; 0x021D441C str r0, [r6, #0x60] cmp r0, #0 bne _021D4456 - bl sub_02022974 + bl GF_AssertFail _021D4456: add r0, r6, #0 mov r2, #1 @@ -1833,7 +1833,7 @@ _021D4C06: bl sub_0205BEA8 b _021D4C2A _021D4C26: - bl sub_02022974 + bl GF_AssertFail _021D4C2A: mov r0, #0x33 mov r1, #0 @@ -2727,7 +2727,7 @@ _021D52E8: str r4, [r5, r0] pop {r3, r4, r5, r6, pc} _021D52F2: - bl sub_02022974 + bl GF_AssertFail add sp, #4 pop {r3, r4, r5, r6, pc} _021D52FA: @@ -3244,7 +3244,7 @@ _021D56A8: ldr r0, [r6, r0] cmp r0, #0 bne _021D56B6 - bl sub_02022974 + bl GF_AssertFail _021D56B6: mov r0, #0xdd lsl r0, r0, #2 diff --git a/asm/ov10_0221F800.s b/asm/ov10_0221F800.s index dd47f3d3fd..047d76602b 100644 --- a/asm/ov10_0221F800.s +++ b/asm/ov10_0221F800.s @@ -2123,7 +2123,7 @@ _02220910: mov r0, #1 pop {r3, r4, pc} _02220926: - bl sub_02022974 + bl GF_AssertFail _0222092A: ldr r0, [r4, #0xc] mov r1, #0 @@ -2895,7 +2895,7 @@ ov10_02220F1C: ; 0x02220F1C cmp r0, #0 bne _02220F44 _02220F40: - bl sub_02022974 + bl GF_AssertFail _02220F44: ldr r0, [r4, #0] ldr r1, [r0, #0] @@ -4120,7 +4120,7 @@ ov10_02221928: ; 0x02221928 bl sub_020145B4 cmp r4, #0 bne _02221940 - bl sub_02022974 + bl GF_AssertFail _02221940: lsl r0, r4, #0x10 lsr r0, r0, #0xd @@ -4140,7 +4140,7 @@ ov10_0222194C: ; 0x0222194C bl sub_020145F4 cmp r4, #0 bne _02221964 - bl sub_02022974 + bl GF_AssertFail _02221964: lsl r0, r4, #0x10 lsr r0, r0, #0xd diff --git a/asm/ov111_021D0D80.s b/asm/ov111_021D0D80.s index 986394a25c..0a7bf3398c 100644 --- a/asm/ov111_021D0D80.s +++ b/asm/ov111_021D0D80.s @@ -4260,7 +4260,7 @@ ov111_021D2E8C: ; 0x021D2E8C cmp r0, #0 bne _021D2EB0 bne _021D2EB0 - bl sub_02022974 + bl GF_AssertFail _021D2EB0: pop {r4, pc} ; .align 2, 0 diff --git a/asm/ov111_021D2F80.s b/asm/ov111_021D2F80.s index 263d6f0151..7ad5f62f6f 100644 --- a/asm/ov111_021D2F80.s +++ b/asm/ov111_021D2F80.s @@ -538,7 +538,7 @@ ov111_021D33B0: ; 0x021D33B0 add r5, r0, #0 cmp r4, #8 blt _021D33C0 - bl sub_02022974 + bl GF_AssertFail _021D33C0: mov r0, #0x13 lsl r0, r0, #4 diff --git a/asm/ov112_0225C700.s b/asm/ov112_0225C700.s index ff7300a047..57a28a12b1 100644 --- a/asm/ov112_0225C700.s +++ b/asm/ov112_0225C700.s @@ -1436,7 +1436,7 @@ _0225D1C6: bl sub_0201DC68 cmp r0, #0 bne _0225D1E2 - bl sub_02022974 + bl GF_AssertFail _0225D1E2: add r4, r4, #1 add r5, r5, #4 @@ -1789,7 +1789,7 @@ ov112_0225D460: ; 0x0225D460 lsl r0, r0, #4 cmp r1, r0 bls _0225D49C - bl sub_02022974 + bl GF_AssertFail _0225D49C: add r0, r5, #0 add r0, #0xc @@ -2122,11 +2122,11 @@ ov112_0225D718: ; 0x0225D718 add r5, r0, #0 cmp r4, #4 blo _0225D726 - bl sub_02022974 + bl GF_AssertFail _0225D726: cmp r4, #0 bne _0225D72E - bl sub_02022974 + bl GF_AssertFail _0225D72E: mov r0, #0xc add r5, #0x40 diff --git a/asm/ov113_0225C700.s b/asm/ov113_0225C700.s index 3992e6637c..64660c4044 100644 --- a/asm/ov113_0225C700.s +++ b/asm/ov113_0225C700.s @@ -3171,7 +3171,7 @@ ov113_0225E15C: ; 0x0225E15C ldr r4, [sp, #0x9c] cmp r0, #0 beq _0225E174 - bl sub_02022974 + bl GF_AssertFail _0225E174: ldr r0, [r6, #8] ldr r1, [sp, #0x1c] @@ -3400,7 +3400,7 @@ _0225E32A: ldr r0, [r5, r0] cmp r0, r1 bge _0225E33E - bl sub_02022974 + bl GF_AssertFail ldr r0, _0225E360 ; =0x000019D4 ldr r1, [r5, r0] add r0, r0, #4 diff --git a/asm/ov113_0225E368.s b/asm/ov113_0225E368.s index f5b30cb94f..0ded961590 100644 --- a/asm/ov113_0225E368.s +++ b/asm/ov113_0225E368.s @@ -499,7 +499,7 @@ ov113_0225E6B8: ; 0x0225E6B8 ldrh r0, [r4, #2] cmp r0, r2 bls _0225E706 - bl sub_02022974 + bl GF_AssertFail mov r0, #0x84 strh r0, [r4, #2] _0225E706: @@ -572,7 +572,7 @@ ov113_0225E774: ; 0x0225E774 str r0, [r5, #0] cmp r0, #0 bne _0225E798 - bl sub_02022974 + bl GF_AssertFail _0225E798: ldr r0, [r5, #0] bl NNS_G3dGetMdlSet @@ -1291,7 +1291,7 @@ ov113_0225ECA0: ; 0x0225ECA0 add r7, r0, #0 cmp r7, #3 blo _0225ECBC - bl sub_02022974 + bl GF_AssertFail _0225ECBC: add r0, r4, #0 add r1, sp, #0x14 @@ -1450,7 +1450,7 @@ _0225EDF6: add r2, r2, #4 cmp r0, #0x80 blt _0225EDD4 - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} ; .align 2, 0 _0225EE04: .word 0x0000053C @@ -1524,7 +1524,7 @@ ov113_0225EE78: ; 0x0225EE78 ldrb r0, [r5, r4] sub r0, r0, #1 bpl _0225EE90 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 _0225EE90: strb r0, [r5, r4] diff --git a/asm/ov113_02260620.s b/asm/ov113_02260620.s index a95b639873..1956d2a7ee 100644 --- a/asm/ov113_02260620.s +++ b/asm/ov113_02260620.s @@ -35,7 +35,7 @@ ov113_02260620: ; 0x02260620 beq _02260706 cmp r5, #8 blo _02260664 - bl sub_02022974 + bl GF_AssertFail add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} _02260664: @@ -119,7 +119,7 @@ ov113_02260714: ; 0x02260714 push {r3, lr} cmp r1, #8 blo _02260720 - bl sub_02022974 + bl GF_AssertFail pop {r3, pc} _02260720: lsl r1, r1, #4 diff --git a/asm/ov114_0225C700.s b/asm/ov114_0225C700.s index a99c124ec4..b9cf773124 100644 --- a/asm/ov114_0225C700.s +++ b/asm/ov114_0225C700.s @@ -47,7 +47,7 @@ _0225C740: ldrb r0, [r6, #8] cmp r5, r0 beq _0225C750 - bl sub_02022974 + bl GF_AssertFail _0225C750: ldr r0, [sp] cmp r0, #0 @@ -97,7 +97,7 @@ ov114_0225C78C: ; 0x0225C78C add r4, r1, #0 cmp r4, r0 blo _0225C79C - bl sub_02022974 + bl GF_AssertFail _0225C79C: add r0, r5, r4 ldrb r0, [r0, #4] @@ -111,7 +111,7 @@ ov114_0225C7A4: ; 0x0225C7A4 cmp r1, #4 blo _0225C7B4 blo _0225C7B0 - bl sub_02022974 + bl GF_AssertFail _0225C7B0: mov r0, #0 pop {r3, pc} @@ -139,7 +139,7 @@ ov114_0225C7CC: ; 0x0225C7CC cmp r4, #4 blo _0225C7E0 blo _0225C7DC - bl sub_02022974 + bl GF_AssertFail _0225C7DC: mov r0, #0 pop {r3, r4, r5, pc} @@ -162,7 +162,7 @@ _0225C800: ldr r0, [r5, #0xc] cmp r0, #0 bne _0225C80A - bl sub_02022974 + bl GF_AssertFail _0225C80A: ldr r1, [r5, #0xc] lsl r0, r4, #2 @@ -281,7 +281,7 @@ ov114_0225C8CC: ; 0x0225C8CC ldrb r0, [r4, #7] cmp r0, #1 beq _0225C8DA - bl sub_02022974 + bl GF_AssertFail _0225C8DA: ldrb r0, [r4, #6] pop {r4, pc} @@ -550,13 +550,13 @@ ov114_0225CA98: ; 0x0225CA98 ldr r0, [r4, #0xc] cmp r0, #0 bne _0225CAA6 - bl sub_02022974 + bl GF_AssertFail _0225CAA6: ldr r0, [r4, #0xc] ldr r0, [r0, #0x1c] cmp r0, #1 beq _0225CAB2 - bl sub_02022974 + bl GF_AssertFail _0225CAB2: bl sub_02032AAC cmp r0, #1 @@ -673,7 +673,7 @@ ov114_0225CB8C: ; 0x0225CB8C ldr r0, [r4, #0x2c] cmp r0, #0 beq _0225CB9A - bl sub_02022974 + bl GF_AssertFail _0225CB9A: ldr r0, _0225CBAC ; =ov114_0225FDC8 add r1, r4, #0 @@ -694,7 +694,7 @@ ov114_0225CBB0: ; 0x0225CBB0 ldr r0, [r4, #0x2c] cmp r0, #0 beq _0225CBBE - bl sub_02022974 + bl GF_AssertFail _0225CBBE: ldr r0, _0225CBD8 ; =ov114_0225FF54 add r1, r4, #0 @@ -951,7 +951,7 @@ _0225CD7C: _0225CD84: cmp r4, #0 bne _0225CD8C - bl sub_02022974 + bl GF_AssertFail _0225CD8C: ldr r0, [sp, #0x38] str r7, [sp] @@ -1010,7 +1010,7 @@ ov114_0225CDE0: ; 0x0225CDE0 str r3, [sp, #0x30] cmp r0, #0 beq _0225CDF6 - bl sub_02022974 + bl GF_AssertFail _0225CDF6: mov r0, #1 ldr r7, [sp, #0x58] @@ -1061,7 +1061,7 @@ _0225CDF6: bl sub_0200A3DC cmp r0, #0 bne _0225CE66 - bl sub_02022974 + bl GF_AssertFail _0225CE66: ldr r0, [r4, #4] bl sub_02009D4C @@ -1069,7 +1069,7 @@ _0225CE66: bl sub_0200A640 cmp r0, #0 bne _0225CE7A - bl sub_02022974 + bl GF_AssertFail _0225CE7A: ldr r0, [r4, #8] bl sub_02009D4C @@ -1110,7 +1110,7 @@ ov114_0225CEB8: ; 0x0225CEB8 ldr r0, [r4, #0] cmp r0, #1 beq _0225CEC8 - bl sub_02022974 + bl GF_AssertFail _0225CEC8: mov r0, #0 str r0, [r4, #0] @@ -2604,7 +2604,7 @@ _0225DA44: cmp r0, r4 blo _0225DA44 _0225DA52: - bl sub_02022974 + bl GF_AssertFail sub r0, r4, #1 _0225DA58: pop {r3, r4, r5, pc} @@ -3296,7 +3296,7 @@ ov114_0225DF7C: ; 0x0225DF7C str r2, [sp] cmp r0, #0 beq _0225DF92 - bl sub_02022974 + bl GF_AssertFail _0225DF92: mov r1, #0 str r4, [r6, #0] @@ -3382,7 +3382,7 @@ ov114_0225E028: ; 0x0225E028 ldr r0, [r0, r1] cmp r0, #0 bne _0225E03C - bl sub_02022974 + bl GF_AssertFail _0225E03C: mov r1, #0xc1 ldr r0, [sp] @@ -3502,7 +3502,7 @@ _0225E10A: str r0, [r6, #8] cmp r0, #0 bne _0225E11E - bl sub_02022974 + bl GF_AssertFail _0225E11E: add r0, r5, r4 str r0, [sp, #4] @@ -3996,7 +3996,7 @@ _0225E4E0: bl sub_02019184 pop {r3, r4, r5, pc} _0225E4FA: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} thumb_func_end ov114_0225E4B0 @@ -4038,7 +4038,7 @@ _0225E530: bl sub_0201C63C pop {r3, r4, r5, pc} _0225E54A: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} thumb_func_end ov114_0225E500 @@ -4239,7 +4239,7 @@ _0225E6D2: str r0, [r4, r1] b _0225E6F4 _0225E6E2: - bl sub_02022974 + bl GF_AssertFail ldr r0, _0225E730 ; =ov114_0225E874 add r1, r4, #0 mov r2, #0 @@ -4667,7 +4667,7 @@ _0225EA38: strh r2, [r4, r0] b _0225EA44 _0225EA40: - bl sub_02022974 + bl GF_AssertFail _0225EA44: add r0, r4, #0 bl ov114_0225F7D8 @@ -5682,7 +5682,7 @@ _0225F1E0: bl sub_0201DC68 cmp r0, #0 bne _0225F1F4 - bl sub_02022974 + bl GF_AssertFail _0225F1F4: ldrb r0, [r5, #0x14] add r6, r6, #1 @@ -6656,7 +6656,7 @@ _0225F912: mov r0, #0 pop {r3, pc} _0225F916: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 diff --git a/asm/ov115_02260440.s b/asm/ov115_02260440.s index 618e74362c..7d9e99574f 100644 --- a/asm/ov115_02260440.s +++ b/asm/ov115_02260440.s @@ -190,7 +190,7 @@ _02260576: str r0, [r4, #0x74] cmp r0, #1 bhi _022605BE - bl sub_02022974 + bl GF_AssertFail _022605BE: bl sub_0203608C add r1, r4, #0 @@ -270,7 +270,7 @@ _0226064E: strb r1, [r0, #9] b _0226065E _0226065A: - bl sub_02022974 + bl GF_AssertFail _0226065E: ldr r0, [r4, #0x34] add r1, sp, #0x14 @@ -856,7 +856,7 @@ ov115_02260A90: ; 0x02260A90 bl ov115_02260BA0 cmp r0, #0 bne _02260AD0 - bl sub_02022974 + bl GF_AssertFail _02260AD0: mov r0, #0 add r4, #0x80 diff --git a/asm/ov115_02260CEC.s b/asm/ov115_02260CEC.s index 0976d4f0a8..690e756927 100644 --- a/asm/ov115_02260CEC.s +++ b/asm/ov115_02260CEC.s @@ -52,7 +52,7 @@ ov115_02260CEC: ; 0x02260CEC bl sub_0201E3F4 cmp r0, #1 beq _02260D56 - bl sub_02022974 + bl GF_AssertFail _02260D56: add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} @@ -73,7 +73,7 @@ ov115_02260D78: ; 0x02260D78 bl sub_0201E530 cmp r0, #1 beq _02260D88 - bl sub_02022974 + bl GF_AssertFail _02260D88: ldr r0, _02260DA4 ; =0x0000878C ldr r1, _02260DA8 ; =0x00001AB4 @@ -1265,7 +1265,7 @@ _022616AC: ldr r0, [sp, #0x14] cmp r0, #0 bge _022616BE - bl sub_02022974 + bl GF_AssertFail _022616BE: ldr r0, [sp, #8] cmp r0, #3 @@ -2874,7 +2874,7 @@ _022622D6: add r2, #0x44 cmp r0, #0x60 blt _02262256 - bl sub_02022974 + bl GF_AssertFail _022622E2: add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -3819,7 +3819,7 @@ _022629A8: bl ov115_02262D3C cmp r0, #0 bne _022629BA - bl sub_02022974 + bl GF_AssertFail _022629BA: add r0, r5, #0 add r0, #0x20 @@ -3827,7 +3827,7 @@ _022629BA: bl ov115_02262D58 cmp r0, #0 bne _022629CC - bl sub_02022974 + bl GF_AssertFail _022629CC: add r0, r5, #0 add r0, #0x20 @@ -4579,7 +4579,7 @@ ov115_02262F50: ; 0x02262F50 add r4, r3, #0 cmp r6, r0 blo _02262F64 - bl sub_02022974 + bl GF_AssertFail _02262F64: mov r0, #0x18 ldr r1, [r5, #4] @@ -4693,13 +4693,13 @@ ov115_02262FB4: ; 0x02262FB4 bl sub_0200A450 cmp r0, #0 bne _02263048 - bl sub_02022974 + bl GF_AssertFail _02263048: ldr r0, [r5, #4] bl sub_0200A640 cmp r0, #0 bne _02263056 - bl sub_02022974 + bl GF_AssertFail _02263056: ldr r0, [r5, #0] bl sub_02009D4C @@ -5964,7 +5964,7 @@ ov115_02263A74: ; 0x02263A74 bl sub_0200A450 cmp r0, #0 bne _02263B08 - bl sub_02022974 + bl GF_AssertFail _02263B08: mov r0, #6 lsl r0, r0, #6 @@ -5972,7 +5972,7 @@ _02263B08: bl sub_0200A640 cmp r0, #0 bne _02263B1A - bl sub_02022974 + bl GF_AssertFail _02263B1A: mov r0, #0x5f lsl r0, r0, #2 @@ -6811,7 +6811,7 @@ ov115_02264190: ; 0x02264190 add r5, r0, #0 cmp r4, #6 blo _0226419E - bl sub_02022974 + bl GF_AssertFail _0226419E: mov r2, #0x21 lsl r2, r2, #4 @@ -7228,7 +7228,7 @@ _02264400: bl sub_0200A450 cmp r0, #0 bne _022644BA - bl sub_02022974 + bl GF_AssertFail _022644BA: mov r0, #0x76 lsl r0, r0, #4 @@ -7236,7 +7236,7 @@ _022644BA: bl sub_0200A640 cmp r0, #0 bne _022644CC - bl sub_02022974 + bl GF_AssertFail _022644CC: ldr r0, _02264554 ; =0x0000075C ldr r0, [r5, r0] @@ -7439,7 +7439,7 @@ _02264672: add r6, r6, r3 cmp r2, #0x60 blt _02264658 - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} ; .align 2, 0 _02264680: .word 0x00000888 @@ -7827,7 +7827,7 @@ _0226496A: add r5, r5, r2 cmp r1, #0x60 blt _02264954 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} nop @@ -8786,7 +8786,7 @@ _02265082: str r1, [r4, r0] b _02265090 _0226508C: - bl sub_02022974 + bl GF_AssertFail _02265090: mov r1, #0x6b lsl r1, r1, #2 @@ -9376,13 +9376,13 @@ ov115_02265478: ; 0x02265478 bl sub_0200A450 cmp r0, #0 bne _02265500 - bl sub_02022974 + bl GF_AssertFail _02265500: ldr r0, [r5, #4] bl sub_0200A640 cmp r0, #0 bne _0226550E - bl sub_02022974 + bl GF_AssertFail _0226550E: ldr r0, [r5, #0] bl sub_02009D4C @@ -9466,7 +9466,7 @@ _0226550E: bl sub_0201ED94 cmp r0, #1 beq _022655CA - bl sub_02022974 + bl GF_AssertFail _022655CA: mov r1, #0x96 str r1, [sp] @@ -9484,7 +9484,7 @@ _022655CA: bl sub_0200A640 cmp r0, #0 bne _022655F2 - bl sub_02022974 + bl GF_AssertFail _022655F2: ldr r0, [r5, #0x60] bl sub_02009D4C diff --git a/asm/ov116_022604C4.s b/asm/ov116_022604C4.s index bdcf394576..37f936963b 100644 --- a/asm/ov116_022604C4.s +++ b/asm/ov116_022604C4.s @@ -2132,7 +2132,7 @@ ov116_022616CC: ; 0x022616CC bl sub_0200C7C0 cmp r0, #0 bne _02261736 - bl sub_02022974 + bl GF_AssertFail _02261736: ldr r0, [r4, #0x50] ldr r1, [r4, #0x54] @@ -2140,7 +2140,7 @@ _02261736: bl sub_0200CB30 cmp r0, #0 bne _02261748 - bl sub_02022974 + bl GF_AssertFail _02261748: ldr r0, [r4, #0x50] bl sub_0200C738 diff --git a/asm/ov116_02261870.s b/asm/ov116_02261870.s index 8a5852034e..0cfa671999 100644 --- a/asm/ov116_02261870.s +++ b/asm/ov116_02261870.s @@ -824,7 +824,7 @@ _02261EF2: add r3, #8 cmp r2, #4 blt _02261EE0 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 add sp, #0x20 pop {r4, r5, r6, pc} @@ -1120,7 +1120,7 @@ _02262114: bl sub_0200710C b _02262134 _02262130: - bl sub_02022974 + bl GF_AssertFail _02262134: ldr r0, [r5, #4] mov r6, #0 diff --git a/asm/ov117_02260668.s b/asm/ov117_02260668.s index 3987ba3076..a8e1c5af49 100644 --- a/asm/ov117_02260668.s +++ b/asm/ov117_02260668.s @@ -1825,7 +1825,7 @@ _0226162E: bl sub_020146F4 pop {r3, pc} _0226163C: - bl sub_02022974 + bl GF_AssertFail pop {r3, pc} ; .align 2, 0 thumb_func_end ov117_02261600 @@ -1839,7 +1839,7 @@ ov117_02261644: ; 0x02261644 blx r3 add r4, r0, #0 bne _02261656 - bl sub_02022974 + bl GF_AssertFail _02261656: add r0, r4, #0 bl sub_020145B4 @@ -1859,7 +1859,7 @@ ov117_02261668: ; 0x02261668 blx r3 add r4, r0, #0 bne _0226167A - bl sub_02022974 + bl GF_AssertFail _0226167A: add r0, r4, #0 bl sub_020145F4 @@ -3115,7 +3115,7 @@ ov117_02262044: ; 0x02262044 ldr r0, [r2, r1] cmp r0, #0 beq _0226208A - bl sub_02022974 + bl GF_AssertFail _0226208A: ldmia r5!, {r0, r1} stmia r4!, {r0, r1} @@ -3193,7 +3193,7 @@ _02262108: ldr r0, [r5, r0] cmp r0, #0 beq _02262114 - bl sub_02022974 + bl GF_AssertFail _02262114: ldr r0, _0226212C ; =0x00002EF0 add r2, r5, r0 @@ -3236,7 +3236,7 @@ ov117_02262130: ; 0x02262130 ldr r0, [r2, r0] cmp r0, #0 beq _02262164 - bl sub_02022974 + bl GF_AssertFail _02262164: ldmia r4!, {r0, r1} stmia r6!, {r0, r1} @@ -3293,7 +3293,7 @@ _022621BC: mov r0, #1 pop {r4, pc} _022621C4: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} _022621CC: @@ -3481,7 +3481,7 @@ _022622F6: _0226230C: cmp r0, #0 bne _02262314 - bl sub_02022974 + bl GF_AssertFail _02262314: mov r1, #0 ldr r0, _02262358 ; =0x02266954 @@ -3550,7 +3550,7 @@ _0226237A: cmp r2, r4 blt _0226236C _02262382: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} ; .align 2, 0 @@ -3566,7 +3566,7 @@ ov117_0226238C: ; 0x0226238C add r6, r2, #0 cmp r0, #0 beq _022623A0 - bl sub_02022974 + bl GF_AssertFail _022623A0: ldr r0, _022623AC ; =0x00002FD4 str r4, [r5, r0] diff --git a/asm/ov117_022626B0_arm.s b/asm/ov117_022626B0_arm.s index 1311b27ce0..e6dd21004d 100644 --- a/asm/ov117_022626B0_arm.s +++ b/asm/ov117_022626B0_arm.s @@ -293,50 +293,50 @@ ov117_02263168: ; 0x02263168 ldr r0, _0226326C ; =0x00007FFF cmp r4, r0 ble _022631C8 - bl sub_02022974 + bl GF_AssertFail _022631C8: mov r0, #0x8000 rsb r0, r0, #0 cmp r4, r0 bge _022631DC - bl sub_02022974 + bl GF_AssertFail _022631DC: ldr r0, _0226326C ; =0x00007FFF cmp r5, r0 ble _022631EC - bl sub_02022974 + bl GF_AssertFail _022631EC: mov r0, #0x8000 rsb r0, r0, #0 cmp r5, r0 bge _02263200 - bl sub_02022974 + bl GF_AssertFail _02263200: ldr r0, _0226326C ; =0x00007FFF sub r1, r4, #0x800 cmp r1, r0 ble _02263214 - bl sub_02022974 + bl GF_AssertFail _02263214: mov r0, #0x8000 sub r1, r4, #0x800 rsb r0, r0, #0 cmp r1, r0 bge _0226322C - bl sub_02022974 + bl GF_AssertFail _0226322C: ldr r0, _0226326C ; =0x00007FFF add r1, r5, #0x800 cmp r1, r0 ble _02263240 - bl sub_02022974 + bl GF_AssertFail _02263240: mov r0, #0x8000 add r1, r5, #0x800 rsb r0, r0, #0 cmp r1, r0 bge _02263258 - bl sub_02022974 + bl GF_AssertFail _02263258: sub r0, r4, #0x800 strh r0, [r7] diff --git a/asm/ov117_022626B0_thumb.s b/asm/ov117_022626B0_thumb.s index ebccc85e9b..b3459501b8 100644 --- a/asm/ov117_022626B0_thumb.s +++ b/asm/ov117_022626B0_thumb.s @@ -647,7 +647,7 @@ ov117_02262B98: ; 0x02262B98 ldr r0, [r5, r0] cmp r0, #0 beq _02262BD0 - bl sub_02022974 + bl GF_AssertFail _02262BD0: mov r0, #0x6e add r1, r4, #0 @@ -687,7 +687,7 @@ _02262BD0: ldr r0, [r0, #0x14] cmp r0, #0 bne _02262C2A - bl sub_02022974 + bl GF_AssertFail _02262C2A: ldr r2, [r5, #4] ldr r0, [r5, #0] diff --git a/asm/ov117_02263AF0.s b/asm/ov117_02263AF0.s index 99c712d210..c4385bf046 100644 --- a/asm/ov117_02263AF0.s +++ b/asm/ov117_02263AF0.s @@ -421,7 +421,7 @@ _02263E00: add r2, #0x18 cmp r3, #0x28 blt _02263DD2 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 add sp, #4 pop {r3, r4, r5, r6, pc} @@ -439,7 +439,7 @@ ov117_02263E1C: ; 0x02263E1C add r5, r1, #0 cmp r0, #0 beq _02263E2E - bl sub_02022974 + bl GF_AssertFail _02263E2E: add r0, r4, #0 mov r1, #0 @@ -2678,14 +2678,14 @@ _02264F52: _02264F5A: cmp r4, #0 bne _02264F66 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _02264F66: ldrb r0, [r4, #1] cmp r0, #0 beq _02264F70 - bl sub_02022974 + bl GF_AssertFail _02264F70: mov r0, #1 strb r7, [r4, #1] @@ -3458,7 +3458,7 @@ _02265534: strh r1, [r0, #2] b _02265558 _02265554: - bl sub_02022974 + bl GF_AssertFail _02265558: ldrb r1, [r5, #0x12] cmp r1, #0xf @@ -5005,7 +5005,7 @@ _0226616E: ldr r0, [r6, r0] cmp r0, #0 beq _0226617A - bl sub_02022974 + bl GF_AssertFail _0226617A: ldr r0, [sp, #0x2c] mov r1, #0xa diff --git a/asm/ov117_022665FC.s b/asm/ov117_022665FC.s index 4fcd309a46..d33d2a6847 100644 --- a/asm/ov117_022665FC.s +++ b/asm/ov117_022665FC.s @@ -112,7 +112,7 @@ _0226668E: ldrb r0, [r0] cmp r2, r0 blt _0226669C - bl sub_02022974 + bl GF_AssertFail _0226669C: ldr r0, [r4, #8] add r0, r0, #1 diff --git a/asm/ov118_021D0D80.s b/asm/ov118_021D0D80.s index ed874e3a64..3ebe4903e0 100644 --- a/asm/ov118_021D0D80.s +++ b/asm/ov118_021D0D80.s @@ -11,7 +11,7 @@ ov118_021D0D80: ; 0x021D0D80 ldr r0, [r4, r0] cmp r0, #0 beq _021D0D90 - bl sub_02022974 + bl GF_AssertFail _021D0D90: mov r0, #0xc mov r1, #0x1c @@ -103,7 +103,7 @@ _021D0E2E: str r0, [r4, #0x10] b _021D0E44 _021D0E40: - bl sub_02022974 + bl GF_AssertFail _021D0E44: ldr r0, _021D0F5C ; =0x000005A4 ldr r0, [r5, r0] @@ -466,7 +466,7 @@ ov118_021D1128: ; 0x021D1128 blx r3 add r4, r0, #0 bne _021D113A - bl sub_02022974 + bl GF_AssertFail _021D113A: add r0, r4, #0 bl sub_020145B4 @@ -486,7 +486,7 @@ ov118_021D114C: ; 0x021D114C blx r3 add r4, r0, #0 bne _021D115E - bl sub_02022974 + bl GF_AssertFail _021D115E: add r0, r4, #0 bl sub_020145F4 diff --git a/asm/ov119_021D0D80.s b/asm/ov119_021D0D80.s index 5742ceb709..0cdf880044 100644 --- a/asm/ov119_021D0D80.s +++ b/asm/ov119_021D0D80.s @@ -147,11 +147,11 @@ ov119_021D0E78: ; 0x021D0E78 add r5, r0, #0 cmp r4, #0 bne _021D0EA0 - bl sub_02022974 + bl GF_AssertFail _021D0EA0: cmp r5, #0 bne _021D0EA8 - bl sub_02022974 + bl GF_AssertFail _021D0EA8: bl sub_02014000 pop {r3, r4, r5, pc} @@ -911,7 +911,7 @@ ov119_021D14AC: ; 0x021D14AC bl sub_02018144 add r4, r0, #0 bne _021D14C0 - bl sub_02022974 + bl GF_AssertFail _021D14C0: ldr r0, [r5, #0] ldr r2, [r5, #4] @@ -1347,7 +1347,7 @@ ov119_021D17B8: ; 0x021D17B8 bl sub_0200C7C0 cmp r0, #0 bne _021D1822 - bl sub_02022974 + bl GF_AssertFail _021D1822: ldr r0, [r4, #0x50] ldr r1, [r4, #0x4c] @@ -1355,7 +1355,7 @@ _021D1822: bl sub_0200CB30 cmp r0, #0 bne _021D1834 - bl sub_02022974 + bl GF_AssertFail _021D1834: add sp, #0x4c pop {r3, r4, r5, r6, pc} diff --git a/asm/ov119_021D191C.s b/asm/ov119_021D191C.s index aab8055f1e..92e644878b 100644 --- a/asm/ov119_021D191C.s +++ b/asm/ov119_021D191C.s @@ -477,7 +477,7 @@ _021D1CAA: str r0, [r4, #0x60] b _021D1E22 _021D1CF8: - bl sub_02022974 + bl GF_AssertFail b _021D1E22 _021D1CFE: bl sub_0200598C diff --git a/asm/ov12_0221FC20.s b/asm/ov12_0221FC20.s index 8fece84442..faef60a7ce 100644 --- a/asm/ov12_0221FC20.s +++ b/asm/ov12_0221FC20.s @@ -79,7 +79,7 @@ _0221FC86: strh r0, [r1] b _0221FC98 _0221FC94: - bl sub_02022974 + bl GF_AssertFail _0221FC98: ldr r2, [sp, #0x10] add r0, r5, #0 @@ -114,7 +114,7 @@ _0221FCC0: strh r0, [r1] b _0221FCD2 _0221FCCE: - bl sub_02022974 + bl GF_AssertFail _0221FCD2: add r0, r4, #0 bl sub_0200DA58 @@ -133,7 +133,7 @@ ov12_0221FCDC: ; 0x0221FCDC bne _0221FCF8 cmp r4, #0 bne _0221FCF4 - bl sub_02022974 + bl GF_AssertFail _0221FCF4: mov r0, #0 pop {r3, r4, r5, pc} @@ -194,7 +194,7 @@ _0221FCF8: cmp r0, #0 bne _0221FD80 bne _0221FD7C - bl sub_02022974 + bl GF_AssertFail _0221FD7C: mov r0, #0 pop {r3, r4, r5, pc} @@ -241,7 +241,7 @@ ov12_0221FDC0: ; 0x0221FDC0 add r4, r1, #0 cmp r5, #0 bne _0221FDCE - bl sub_02022974 + bl GF_AssertFail _0221FDCE: str r4, [r5, #8] pop {r3, r4, r5, pc} @@ -253,7 +253,7 @@ ov12_0221FDD4: ; 0x0221FDD4 push {r4, lr} add r4, r0, #0 bne _0221FDDE - bl sub_02022974 + bl GF_AssertFail _0221FDDE: ldr r0, [r4, #8] pop {r4, pc} @@ -265,7 +265,7 @@ ov12_0221FDE4: ; 0x0221FDE4 push {r4, lr} add r4, r0, #0 bne _0221FDEE - bl sub_02022974 + bl GF_AssertFail _0221FDEE: ldr r0, [r4, #0] pop {r4, pc} @@ -434,7 +434,7 @@ _0221FE7E: ldr r0, [r0, #0] cmp r0, #0 bne _0221FF30 - bl sub_02022974 + bl GF_AssertFail _0221FF30: ldr r0, [sp, #4] mov r2, #0 @@ -627,7 +627,7 @@ _0222008E: cmp r0, #0 bne _022200AE bne _022200A8 - bl sub_02022974 + bl GF_AssertFail _022200A8: add sp, #0x3c mov r0, #0 @@ -762,7 +762,7 @@ ov12_02220198: ; 0x02220198 cmp r0, #0 bne _022201AA bne _022201A6 - bl sub_02022974 + bl GF_AssertFail _022201A6: mov r0, #0 pop {r3, pc} @@ -929,7 +929,7 @@ ov12_02220280: ; 0x02220280 add r4, r0, #0 cmp r5, #0xa blt _0222028E - bl sub_02022974 + bl GF_AssertFail _0222028E: lsl r0, r5, #2 add r0, r4, r0 @@ -945,18 +945,18 @@ ov12_02220298: ; 0x02220298 add r5, r0, #0 cmp r4, #0xa blt _022202A6 - bl sub_02022974 + bl GF_AssertFail _022202A6: cmp r5, #0 bne _022202AE - bl sub_02022974 + bl GF_AssertFail _022202AE: add r5, #0xdc lsl r4, r4, #2 ldr r0, [r5, r4] cmp r0, #0 bne _022202BC - bl sub_02022974 + bl GF_AssertFail _022202BC: ldr r0, [r5, r4] pop {r3, r4, r5, pc} @@ -969,11 +969,11 @@ ov12_022202C0: ; 0x022202C0 add r5, r0, #0 cmp r4, #5 blt _022202CE - bl sub_02022974 + bl GF_AssertFail _022202CE: cmp r5, #0 bne _022202D6 - bl sub_02022974 + bl GF_AssertFail _022202D6: mov r0, #0x4f lsl r0, r0, #2 @@ -982,7 +982,7 @@ _022202D6: ldr r0, [r5, r4] cmp r0, #0 bne _022202E8 - bl sub_02022974 + bl GF_AssertFail _022202E8: ldr r0, [r5, r4] pop {r3, r4, r5, pc} @@ -993,7 +993,7 @@ ov12_022202EC: ; 0x022202EC push {r4, lr} add r4, r0, #0 bne _022202F6 - bl sub_02022974 + bl GF_AssertFail _022202F6: mov r0, #0x4e lsl r0, r0, #2 @@ -1029,7 +1029,7 @@ ov12_02220314: ; 0x02220314 bl sub_02018144 add r4, r0, #0 bne _0222032C - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _0222032C: @@ -1553,7 +1553,7 @@ _0222068A: str r0, [r1, #4] pop {r3, r4, r5, r6, r7, pc} _0222069E: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov12_02220590 @@ -2145,7 +2145,7 @@ _02220AE8: ldr r4, [r1, r0] cmp r4, #0xff bne _02220B28 - bl sub_02022974 + bl GF_AssertFail _02220B28: sub r0, r4, #1 add sp, #0x90 @@ -2189,7 +2189,7 @@ _02220B40: ldr r4, [r1, r0] cmp r4, #0xff bne _02220B80 - bl sub_02022974 + bl GF_AssertFail _02220B80: add r0, r4, #0 add sp, #0x90 @@ -2440,7 +2440,7 @@ ov12_02220D3C: ; 0x02220D3C ldr r0, [r0, #0x1c] cmp r0, #0 beq _02220D60 - bl sub_02022974 + bl GF_AssertFail _02220D60: ldr r0, [r5, #0x18] mov r2, #0 @@ -2485,7 +2485,7 @@ ov12_02220D90: ; 0x02220D90 ldr r0, [r0, #0x1c] cmp r0, #0 beq _02220DB6 - bl sub_02022974 + bl GF_AssertFail _02220DB6: ldr r0, [r5, #0x18] mov r1, #0x64 @@ -3777,7 +3777,7 @@ _02221734: ldr r0, [r6, r4] cmp r0, #0 beq _02221748 - bl sub_02022974 + bl GF_AssertFail _02221748: ldr r0, [sp, #0x24] mov r2, #1 @@ -4405,7 +4405,7 @@ ov12_02221BBC: ; 0x02221BBC bl sub_02018144 add r4, r0, #0 bne _02221BD4 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _02221BD4: @@ -5372,7 +5372,7 @@ ov12_02222338: ; 0x02222338 push {r4, lr} add r4, r0, #0 bne _02222342 - bl sub_02022974 + bl GF_AssertFail _02222342: mov r0, #6 lsl r0, r0, #6 @@ -6703,7 +6703,7 @@ ov12_02222CE8: ; 0x02222CE8 ldr r0, [r6, r4] cmp r0, #0 beq _02222D10 - bl sub_02022974 + bl GF_AssertFail _02222D10: add r0, r5, #0 add r0, #0xc0 @@ -6715,7 +6715,7 @@ _02222D10: ldr r0, [r6, r4] cmp r0, #0 bne _02222D2A - bl sub_02022974 + bl GF_AssertFail _02222D2A: add r0, r5, #0 add r0, #0xc0 @@ -7147,7 +7147,7 @@ _0222303E: ldr r0, [r5, r4] cmp r0, #0 beq _02223072 - bl sub_02022974 + bl GF_AssertFail _02223072: str r6, [r5, r4] add sp, #0x34 @@ -7206,10 +7206,10 @@ _022230C8: .word sub_0200D3F4 thumb_func_start ov12_022230CC ov12_022230CC: ; 0x022230CC - ldr r3, _022230D0 ; =sub_02022974 + ldr r3, _022230D0 ; =GF_AssertFail bx r3 ; .align 2, 0 -_022230D0: .word sub_02022974 +_022230D0: .word GF_AssertFail thumb_func_end ov12_022230CC thumb_func_start ov12_022230D4 @@ -7441,7 +7441,7 @@ ov12_0222325C: ; 0x0222325C beq _0222327E cmp r5, r2 beq _0222327A - bl sub_02022974 + bl GF_AssertFail _0222327A: mov r0, #0 pop {r3, r4, r5, pc} @@ -8215,7 +8215,7 @@ ov12_022237D8: ; 0x022237D8 push {r4, lr} add r4, r0, #0 bne _022237E2 - bl sub_02022974 + bl GF_AssertFail _022237E2: ldr r0, [r4, #4] add r0, r4, r0 diff --git a/asm/ov12_02225864.s b/asm/ov12_02225864.s index 446357d7ca..6f743ba667 100644 --- a/asm/ov12_02225864.s +++ b/asm/ov12_02225864.s @@ -128,7 +128,7 @@ _02225930: ldrsh r0, [r1, r0] pop {r3, r4, r5, r6, r7, pc} _02225940: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -332,7 +332,7 @@ ov12_02225A8C: ; 0x02225A8C str r3, [sp] cmp r5, #0 bne _02225A9E - bl sub_02022974 + bl GF_AssertFail _02225A9E: cmp r4, r7 bls _02225AAA @@ -373,7 +373,7 @@ ov12_02225AE0: ; 0x02225AE0 push {r4, lr} add r4, r0, #0 bne _02225AEA - bl sub_02022974 + bl GF_AssertFail _02225AEA: ldr r0, [r4, #4] cmp r0, #0 @@ -502,7 +502,7 @@ ov12_02225BC8: ; 0x02225BC8 str r2, [sp] cmp r5, #0 bne _02225BDC - bl sub_02022974 + bl GF_AssertFail _02225BDC: strh r4, [r5] strh r6, [r5, #2] @@ -537,7 +537,7 @@ ov12_02225C14: ; 0x02225C14 push {r4, lr} add r4, r0, #0 bne _02225C1E - bl sub_02022974 + bl GF_AssertFail _02225C1E: ldr r0, [r4, #4] cmp r0, #0 @@ -654,11 +654,11 @@ ov12_02225CE4: ; 0x02225CE4 add r4, r1, #0 cmp r5, #0 bne _02225CF2 - bl sub_02022974 + bl GF_AssertFail _02225CF2: cmp r4, #0 bne _02225CFA - bl sub_02022974 + bl GF_AssertFail _02225CFA: add r0, r5, #0 bl ov12_02225C14 @@ -716,7 +716,7 @@ ov12_02225D50: ; 0x02225D50 add r4, r3, #0 cmp r5, #0 bne _02225D62 - bl sub_02022974 + bl GF_AssertFail _02225D62: str r6, [r5, #0] lsl r0, r6, #0xc @@ -739,7 +739,7 @@ ov12_02225D78: ; 0x02225D78 add r4, r3, #0 cmp r5, #0 bne _02225D8A - bl sub_02022974 + bl GF_AssertFail _02225D8A: str r6, [r5, #0] lsl r6, r6, #0xc @@ -758,7 +758,7 @@ ov12_02225DA0: ; 0x02225DA0 push {r4, lr} add r4, r0, #0 bne _02225DAA - bl sub_02022974 + bl GF_AssertFail _02225DAA: ldr r0, [r4, #4] cmp r0, #0 @@ -783,7 +783,7 @@ ov12_02225DC8: ; 0x02225DC8 push {r4, lr} add r4, r0, #0 bne _02225DD2 - bl sub_02022974 + bl GF_AssertFail _02225DD2: ldr r0, [r4, #4] cmp r0, #0 @@ -825,7 +825,7 @@ ov12_02225E0C: ; 0x02225E0C push {r4, lr} add r4, r0, #0 bne _02225E16 - bl sub_02022974 + bl GF_AssertFail _02225E16: ldr r0, [r4, #4] cmp r0, #0 @@ -878,7 +878,7 @@ ov12_02225E68: ; 0x02225E68 add r7, r3, #0 cmp r4, #0 bne _02225E7A - bl sub_02022974 + bl GF_AssertFail _02225E7A: ldr r0, [sp, #0x18] add r1, r6, #0 @@ -915,7 +915,7 @@ ov12_02225EB8: ; 0x02225EB8 push {r4, lr} add r4, r0, #0 bne _02225EC2 - bl sub_02022974 + bl GF_AssertFail _02225EC2: ldr r0, [r4, #4] cmp r0, #0 @@ -952,7 +952,7 @@ ov12_02225EF0: ; 0x02225EF0 str r3, [sp] cmp r5, #0 bne _02225F02 - bl sub_02022974 + bl GF_AssertFail _02225F02: ldr r0, [sp, #0x20] add r1, sp, #8 @@ -1008,7 +1008,7 @@ ov12_02225F6C: ; 0x02225F6C push {r4, lr} add r4, r0, #0 bne _02225F76 - bl sub_02022974 + bl GF_AssertFail _02225F76: ldr r0, [r4, #4] cmp r0, #0 @@ -1238,7 +1238,7 @@ ov12_02226108: ; 0x02226108 add r7, r3, #0 cmp r5, #0 bne _0222611A - bl sub_02022974 + bl GF_AssertFail _0222611A: str r7, [r5, #4] ldr r0, [sp, #0x18] @@ -1262,7 +1262,7 @@ ov12_02226138: ; 0x02226138 push {r4, lr} add r4, r0, #0 bne _02226142 - bl sub_02022974 + bl GF_AssertFail _02226142: ldr r0, [r4, #0xc] cmp r0, #0 @@ -1745,7 +1745,7 @@ ov12_02226490: ; 0x02226490 add r7, r3, #0 cmp r5, #0 bne _022264A2 - bl sub_02022974 + bl GF_AssertFail _022264A2: mov r0, #1 str r0, [r5, #8] @@ -1774,7 +1774,7 @@ ov12_022264D0: ; 0x022264D0 push {r4, lr} add r4, r0, #0 bne _022264DA - bl sub_02022974 + bl GF_AssertFail _022264DA: ldr r0, [r4, #4] cmp r0, #0 @@ -1795,7 +1795,7 @@ ov12_022264F4: ; 0x022264F4 push {r4, lr} add r4, r0, #0 bne _022264FE - bl sub_02022974 + bl GF_AssertFail _022264FE: mov r0, #0 str r0, [r4, #8] @@ -1856,7 +1856,7 @@ ov12_02226544: ; 0x02226544 bl memset cmp r4, #0 bne _02226566 - bl sub_02022974 + bl GF_AssertFail _02226566: mov r2, #0x32 add r1, r4, #0 @@ -1868,7 +1868,7 @@ _02226566: str r0, [r4, #0x1c] cmp r0, #0 bne _02226580 - bl sub_02022974 + bl GF_AssertFail _02226580: mov r0, #0x62 lsl r0, r0, #4 @@ -1903,7 +1903,7 @@ ov12_022265C0: ; 0x022265C0 push {r4, lr} add r4, r0, #0 bne _022265CA - bl sub_02022974 + bl GF_AssertFail _022265CA: add r0, r4, #0 bl ov12_022264D0 @@ -1923,7 +1923,7 @@ ov12_022265E4: ; 0x022265E4 push {r4, lr} add r4, r0, #0 bne _022265EE - bl sub_02022974 + bl GF_AssertFail _022265EE: ldr r0, [r4, #0x1c] bl sub_02013B54 @@ -1936,7 +1936,7 @@ ov12_022265F8: ; 0x022265F8 push {r4, lr} add r4, r0, #0 bne _02226602 - bl sub_02022974 + bl GF_AssertFail _02226602: add r0, r4, #0 bl ov12_022264F4 @@ -1978,7 +1978,7 @@ ov12_0222662C: ; 0x0222662C bl sub_02018144 add r4, r0, #0 bne _02226648 - bl sub_02022974 + bl GF_AssertFail _02226648: add r0, r4, #0 mov r1, #0 @@ -2023,7 +2023,7 @@ ov12_0222669C: ; 0x0222669C push {r4, lr} add r4, r0, #0 bne _022266A6 - bl sub_02022974 + bl GF_AssertFail _022266A6: add r0, r4, #0 bl ov12_022264D0 @@ -2043,7 +2043,7 @@ ov12_022266C0: ; 0x022266C0 push {r4, lr} add r4, r0, #0 bne _022266CA - bl sub_02022974 + bl GF_AssertFail _022266CA: ldr r0, [r4, #0x1c] bl sub_02013D94 @@ -2056,7 +2056,7 @@ ov12_022266D4: ; 0x022266D4 push {r4, lr} add r4, r0, #0 bne _022266DE - bl sub_02022974 + bl GF_AssertFail _022266DE: add r0, r4, #0 bl ov12_022264F4 @@ -2280,7 +2280,7 @@ ov12_02226848: ; 0x02226848 push {r4, lr} add r4, r0, #0 bne _02226852 - bl sub_02022974 + bl GF_AssertFail _02226852: ldr r0, [r4, #0] pop {r4, pc} @@ -2292,7 +2292,7 @@ ov12_02226858: ; 0x02226858 push {r4, lr} add r4, r0, #0 bne _02226862 - bl sub_02022974 + bl GF_AssertFail _02226862: ldr r0, [r4, #4] bl sub_0200DA58 @@ -2312,7 +2312,7 @@ ov12_02226870: ; 0x02226870 bl sub_02018144 add r4, r0, #0 bne _02226888 - bl sub_02022974 + bl GF_AssertFail _02226888: str r5, [r4, #0x18] str r6, [r4, #8] diff --git a/asm/ov12_022269C0.s b/asm/ov12_022269C0.s index 4590a5286a..a1bd6bb199 100644 --- a/asm/ov12_022269C0.s +++ b/asm/ov12_022269C0.s @@ -210,7 +210,7 @@ ov12_02226B1C: ; 0x02226B1C bl sub_02018144 add r4, r0, #0 bne _02226B3A - bl sub_02022974 + bl GF_AssertFail _02226B3A: mov r0, #0 strb r0, [r4] diff --git a/asm/ov12_02226B84.s b/asm/ov12_02226B84.s index 963b66d063..6cdb5a8ede 100644 --- a/asm/ov12_02226B84.s +++ b/asm/ov12_02226B84.s @@ -1324,7 +1324,7 @@ _022275D6: str r0, [r4, #0x28] b _022275F4 _022275F0: - bl sub_02022974 + bl GF_AssertFail _022275F4: ldr r0, [r4, #0x28] mov r1, #0 @@ -1650,7 +1650,7 @@ _02227868: lsl r4, r4, #8 b _02227872 _0222786E: - bl sub_02022974 + bl GF_AssertFail _02227872: add r0, r5, #0 mov r1, #1 @@ -1988,7 +1988,7 @@ _02227AE8: str r0, [r6, #4] b _02227AF8 _02227AF4: - bl sub_02022974 + bl GF_AssertFail _02227AF8: ldr r0, [r6, #4] cmp r0, #0 @@ -3148,7 +3148,7 @@ _0222841A: add r6, r0, #0 b _0222843A _02228436: - bl sub_02022974 + bl GF_AssertFail _0222843A: cmp r6, #0xff bne _02228446 @@ -3351,7 +3351,7 @@ _022285B6: add r6, r0, #0 b _022285D6 _022285D2: - bl sub_02022974 + bl GF_AssertFail _022285D6: cmp r6, #0xff bne _022285E2 @@ -4232,7 +4232,7 @@ _02228D10: add r6, r0, #0 b _02228D30 _02228D2C: - bl sub_02022974 + bl GF_AssertFail _02228D30: cmp r6, #0xff bne _02228D3C @@ -4488,7 +4488,7 @@ _02228F2A: str r0, [sp, #8] b _02228F40 _02228F3C: - bl sub_02022974 + bl GF_AssertFail _02228F40: add r2, r5, #0 ldr r1, [sp, #8] @@ -4610,7 +4610,7 @@ _02229028: str r0, [sp, #8] b _0222903E _0222903A: - bl sub_02022974 + bl GF_AssertFail _0222903E: add r2, r4, #0 ldr r1, [sp, #8] @@ -4739,7 +4739,7 @@ _0222912A: add r6, r0, #0 b _02229140 _0222913C: - bl sub_02022974 + bl GF_AssertFail _02229140: add r0, r5, #0 add r1, r6, #0 @@ -5020,7 +5020,7 @@ _02229372: add r7, r0, #0 b _02229388 _02229384: - bl sub_02022974 + bl GF_AssertFail _02229388: add r0, r5, #0 mov r1, #1 @@ -5156,7 +5156,7 @@ _02229494: add r4, r0, #0 b _022294A8 _022294A4: - bl sub_02022974 + bl GF_AssertFail _022294A8: add r0, r4, #0 pop {r3, r4, r5, pc} @@ -5860,7 +5860,7 @@ _02229A3E: ldr r0, [r4, #0x38] cmp r0, #0 bne _02229A48 - bl sub_02022974 + bl GF_AssertFail _02229A48: pop {r3, r4, r5, pc} nop @@ -6212,7 +6212,7 @@ _02229D0E: ldr r0, [r4, #0x38] cmp r0, #0 bne _02229D1A - bl sub_02022974 + bl GF_AssertFail _02229D1A: ldr r1, [r4, #0x14] add r0, r5, #0 diff --git a/asm/ov12_0222AC70.s b/asm/ov12_0222AC70.s index 6b7c1f5f0d..ab7e9be8d1 100644 --- a/asm/ov12_0222AC70.s +++ b/asm/ov12_0222AC70.s @@ -274,7 +274,7 @@ ov12_0222AE68: ; 0x0222AE68 bl sub_02018144 add r4, r0, #0 bne _0222AE86 - bl sub_02022974 + bl GF_AssertFail _0222AE86: mov r0, #0 strb r0, [r4, #4] diff --git a/asm/ov12_0222D6B0.s b/asm/ov12_0222D6B0.s index 2a5f439694..4af99fd0be 100644 --- a/asm/ov12_0222D6B0.s +++ b/asm/ov12_0222D6B0.s @@ -168,7 +168,7 @@ ov12_0222D7C0: ; 0x0222D7C0 bl sub_02018144 add r4, r0, #0 bne _0222D7DE - bl sub_02022974 + bl GF_AssertFail _0222D7DE: mov r0, #0 strb r0, [r4, #4] @@ -624,7 +624,7 @@ ov12_0222DB60: ; 0x0222DB60 bl sub_02018144 add r4, r0, #0 bne _0222DB7E - bl sub_02022974 + bl GF_AssertFail _0222DB7E: mov r0, #0 strb r0, [r4, #7] @@ -1092,7 +1092,7 @@ ov12_0222DEFC: ; 0x0222DEFC bl sub_02018144 add r6, r0, #0 bne _0222DF1A - bl sub_02022974 + bl GF_AssertFail _0222DF1A: mov r0, #0 strb r0, [r6, #1] diff --git a/asm/ov12_0222F700.s b/asm/ov12_0222F700.s index f6308b9f46..3bf21f4623 100644 --- a/asm/ov12_0222F700.s +++ b/asm/ov12_0222F700.s @@ -4042,7 +4042,7 @@ _022317FC: add sp, #8 pop {r3, pc} _02231814: - bl sub_02022974 + bl GF_AssertFail add sp, #8 pop {r3, pc} thumb_func_end ov12_02231760 @@ -4311,7 +4311,7 @@ _02231A14: add sp, #8 pop {r3, pc} _02231A2E: - bl sub_02022974 + bl GF_AssertFail add sp, #8 pop {r3, pc} ; .align 2, 0 diff --git a/asm/ov12_02235254.s b/asm/ov12_02235254.s index 39b7eab68f..a7bc372335 100644 --- a/asm/ov12_02235254.s +++ b/asm/ov12_02235254.s @@ -118,7 +118,7 @@ _02235300: add r4, r4, #1 cmp r4, #4 blt _022352BC - bl sub_02022974 + bl GF_AssertFail add r0, r5, #0 _0223530C: pop {r4, r5, r6, pc} @@ -162,7 +162,7 @@ _02235342: mov r0, #4 pop {r3, pc} _02235346: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -272,7 +272,7 @@ _02235402: mov r5, #7 b _0223540A _02235406: - bl sub_02022974 + bl GF_AssertFail _0223540A: mov r0, #0x12 lsl r0, r0, #4 @@ -1614,7 +1614,7 @@ ov12_02235E50: ; 0x02235E50 add r5, r1, #0 cmp r4, #0 bne _02235E5E - bl sub_02022974 + bl GF_AssertFail _02235E5E: add r0, r4, #0 bl ov12_0221FDE4 @@ -1622,7 +1622,7 @@ _02235E5E: bl sub_02018144 add r4, r0, #0 bne _02235E72 - bl sub_02022974 + bl GF_AssertFail _02235E72: add r0, r4, #0 mov r1, #0 @@ -1637,7 +1637,7 @@ ov12_02235E80: ; 0x02235E80 push {r4, lr} add r4, r0, #0 bne _02235E8A - bl sub_02022974 + bl GF_AssertFail _02235E8A: add r0, r4, #0 bl sub_020181C4 diff --git a/asm/ov12_02235E94.s b/asm/ov12_02235E94.s index 6771da6475..513b203ce4 100644 --- a/asm/ov12_02235E94.s +++ b/asm/ov12_02235E94.s @@ -221,7 +221,7 @@ ov12_02235FE0: ; 0x02235FE0 bl sub_02018144 cmp r0, #0 bne _02235FF6 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} _02235FF6: @@ -281,7 +281,7 @@ ov12_02236030: ; 0x02236030 ldr r0, [r0, #0] cmp r0, #0xd blt _0223605E - bl sub_02022974 + bl GF_AssertFail _0223605E: add r0, r4, #0 add r0, #0x9c @@ -381,7 +381,7 @@ _022360E4: ldr r0, [r0, #0x14] cmp r0, #0 beq _0223611E - bl sub_02022974 + bl GF_AssertFail _0223611E: add r0, r4, #0 add r0, #0x8c @@ -401,7 +401,7 @@ _0223611E: cmp r0, #0 bne _0223614A bne _02236150 - bl sub_02022974 + bl GF_AssertFail b _02236150 _0223614A: ldr r0, [r6, #0] @@ -452,7 +452,7 @@ _02236174: ldr r0, [r0, #0x14] cmp r0, #0 beq _022361AE - bl sub_02022974 + bl GF_AssertFail _022361AE: add r0, r4, #0 add r0, #0x8c @@ -472,7 +472,7 @@ _022361AE: cmp r0, #0 bne _022361DA bne _022361E0 - bl sub_02022974 + bl GF_AssertFail b _022361E0 _022361DA: ldr r0, [r6, #0] @@ -523,7 +523,7 @@ _02236204: ldr r0, [r0, #0x14] cmp r0, #0 beq _0223623E - bl sub_02022974 + bl GF_AssertFail _0223623E: add r0, r4, #0 add r0, #0x8c @@ -543,7 +543,7 @@ _0223623E: cmp r0, #0 bne _0223626A bne _02236270 - bl sub_02022974 + bl GF_AssertFail b _02236270 _0223626A: ldr r0, [r6, #0] @@ -594,7 +594,7 @@ _02236294: ldr r0, [r0, #0x14] cmp r0, #0 beq _022362CE - bl sub_02022974 + bl GF_AssertFail _022362CE: add r0, r4, #0 add r0, #0x8c @@ -614,7 +614,7 @@ _022362CE: cmp r0, #0 bne _022362FA bne _02236300 - bl sub_02022974 + bl GF_AssertFail b _02236300 _022362FA: ldr r0, [r6, #0] @@ -744,7 +744,7 @@ ov12_022363CC: ; 0x022363CC mov r7, #0 cmp r0, #9 ble _022363DE - bl sub_02022974 + bl GF_AssertFail _022363DE: ldr r0, [r6, #0x10] mov r4, #0 @@ -874,7 +874,7 @@ _022364BC: bl sub_02018144 add r4, r0, #0 bne _022364CC - bl sub_02022974 + bl GF_AssertFail _022364CC: str r7, [r4, #0] ldr r0, [r6, #4] @@ -891,7 +891,7 @@ _022364CC: str r0, [r4, #0x14] cmp r0, #0 bne _022364EE - bl sub_02022974 + bl GF_AssertFail _022364EE: ldr r0, [r4, #0x14] bl ov12_02237EA0 @@ -1123,7 +1123,7 @@ ov12_02236690: ; 0x02236690 bl sub_02018144 add r4, r0, #0 bne _022366A4 - bl sub_02022974 + bl GF_AssertFail _022366A4: ldmia r5!, {r0, r1} add r2, r4, #0 @@ -1980,7 +1980,7 @@ _02236C74: ldr r0, [r5, #0x18] cmp r0, #3 blt _02236C7E - bl sub_02022974 + bl GF_AssertFail _02236C7E: ldr r0, [r5, #8] add r0, r0, #1 @@ -3410,7 +3410,7 @@ ov12_02237728: ; 0x02237728 bl MI_CpuFill8 cmp r4, #0 bne _02237746 - bl sub_02022974 + bl GF_AssertFail _02237746: add r3, r4, #0 add r3, #0x90 @@ -3502,7 +3502,7 @@ ov12_022377F8: ; 0x022377F8 push {r4, lr} add r4, r0, #0 bne _02237802 - bl sub_02022974 + bl GF_AssertFail _02237802: ldr r0, [r4, #0x1c] cmp r0, #0 @@ -3519,7 +3519,7 @@ ov12_02237810: ; 0x02237810 push {r4, lr} add r4, r0, #0 bne _0223781A - bl sub_02022974 + bl GF_AssertFail _0223781A: ldr r0, [r4, #0x28] cmp r0, #0 @@ -3555,7 +3555,7 @@ ov12_0223783C: ; 0x0223783C push {r4, lr} add r4, r0, #0 bne _02237846 - bl sub_02022974 + bl GF_AssertFail _02237846: add r0, r4, #0 add r0, #0xac @@ -3600,7 +3600,7 @@ ov12_02237890: ; 0x02237890 push {r4, lr} add r4, r0, #0 bne _0223789A - bl sub_02022974 + bl GF_AssertFail _0223789A: add r4, #0x98 ldr r0, [r4, #0] diff --git a/asm/ov12_02237EFC.s b/asm/ov12_02237EFC.s index a932c6c4b2..b541a4d227 100644 --- a/asm/ov12_02237EFC.s +++ b/asm/ov12_02237EFC.s @@ -15,7 +15,7 @@ ov12_02237EFC: ; 0x02237EFC bl sub_02018144 add r4, r0, #0 bne _02237F14 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} _02237F14: @@ -70,7 +70,7 @@ _02237F60: _02237F68: cmp r4, #0 bne _02237F70 - bl sub_02022974 + bl GF_AssertFail _02237F70: add r0, r4, #0 pop {r4, r5, r6, pc} @@ -135,7 +135,7 @@ ov12_02237FC8: ; 0x02237FC8 bl sub_02018144 add r4, r0, #0 bne _02237FE0 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} _02237FE0: @@ -253,7 +253,7 @@ _02238094: sub r0, r5, #5 cmp r0, #0x16 blo _022380AC - bl sub_02022974 + bl GF_AssertFail add sp, #0x58 mov r0, #0 pop {r3, r4, r5, pc} diff --git a/asm/ov14_0221FC20.s b/asm/ov14_0221FC20.s index b1ce21c914..e717bc1ff0 100644 --- a/asm/ov14_0221FC20.s +++ b/asm/ov14_0221FC20.s @@ -1897,7 +1897,7 @@ _02220A84: str r0, [r4, r1] pop {r3, r4, r5, pc} _02220AA4: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} nop _02220AAC: .word 0x000003CF @@ -5448,7 +5448,7 @@ _02222606: str r0, [r1, #0] pop {r4, r5, r6, pc} _02222624: - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} nop _0222262C: .word 0x000003CF @@ -5652,11 +5652,11 @@ ov14_022227A4: ; 0x022227A4 add r6, r0, #0 cmp r4, #1 bne _022227C8 - bl sub_02022974 + bl GF_AssertFail _022227C8: cmp r4, #0 bne _022227D0 - bl sub_02022974 + bl GF_AssertFail _022227D0: lsl r1, r4, #0x18 add r0, r5, #0 @@ -5691,11 +5691,11 @@ ov14_022227F4: ; 0x022227F4 add r6, r0, #0 cmp r4, #1 bne _02222818 - bl sub_02022974 + bl GF_AssertFail _02222818: cmp r4, #0 bne _02222820 - bl sub_02022974 + bl GF_AssertFail _02222820: lsl r1, r4, #0x18 add r0, r5, #0 @@ -6259,7 +6259,7 @@ ov14_02222C28: ; 0x02222C28 ldrb r0, [r4, r0] cmp r0, #8 bls _02222C58 - bl sub_02022974 + bl GF_AssertFail _02222C58: pop {r3, r4, r5, pc} nop diff --git a/asm/ov16_0223B140.s b/asm/ov16_0223B140.s index 6a95a2fc64..011fa77653 100644 --- a/asm/ov16_0223B140.s +++ b/asm/ov16_0223B140.s @@ -722,7 +722,7 @@ ov16_0223B748: ; 0x0223B748 ldrb r0, [r5, r0] cmp r0, r4 bne _0223B75A - bl sub_02022974 + bl GF_AssertFail _0223B75A: ldr r0, _0223B784 ; =0x00002445 cmp r4, #0 @@ -2203,7 +2203,7 @@ _0223C310: ldr r0, [r0, r1] cmp r0, #0 bne _0223C46E - bl sub_02022974 + bl GF_AssertFail _0223C46E: ldr r5, [sp, #4] mov r0, #0 @@ -3428,11 +3428,11 @@ ov16_0223CE28: ; 0x0223CE28 add r5, r0, #0 cmp r4, #0 bne _0223CE50 - bl sub_02022974 + bl GF_AssertFail _0223CE50: cmp r5, #0 bne _0223CE58 - bl sub_02022974 + bl GF_AssertFail _0223CE58: bl sub_02014000 pop {r3, r4, r5, pc} diff --git a/asm/ov16_0223DF00.s b/asm/ov16_0223DF00.s index 113db88c03..162ae2e7b5 100644 --- a/asm/ov16_0223DF00.s +++ b/asm/ov16_0223DF00.s @@ -542,7 +542,7 @@ _0223E1E8: ldr r0, [r6, #0x44] cmp r4, r0 blt _0223E1F2 - bl sub_02022974 + bl GF_AssertFail _0223E1F2: add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} @@ -2032,7 +2032,7 @@ ov16_0223ED6C: ; 0x0223ED6C ldr r0, [r4, #0x30] cmp r0, #0 bne _0223ED7A - bl sub_02022974 + bl GF_AssertFail _0223ED7A: ldr r1, [r4, #0x30] add r0, r4, #0 @@ -2827,7 +2827,7 @@ ov16_0223F2B8: ; 0x0223F2B8 add r4, r0, #0 cmp r5, #4 blt _0223F2C6 - bl sub_02022974 + bl GF_AssertFail _0223F2C6: lsl r0, r5, #4 ldr r0, [r4, r0] @@ -2842,7 +2842,7 @@ ov16_0223F2CC: ; 0x0223F2CC add r6, r2, #0 cmp r4, #4 blt _0223F2DC - bl sub_02022974 + bl GF_AssertFail _0223F2DC: lsl r0, r4, #4 add r0, r5, r0 @@ -2858,7 +2858,7 @@ ov16_0223F2E4: ; 0x0223F2E4 add r6, r2, #0 cmp r4, #4 blt _0223F2F4 - bl sub_02022974 + bl GF_AssertFail _0223F2F4: lsl r0, r4, #4 add r0, r5, r0 @@ -2874,7 +2874,7 @@ ov16_0223F2FC: ; 0x0223F2FC add r6, r2, #0 cmp r4, #4 blt _0223F30C - bl sub_02022974 + bl GF_AssertFail _0223F30C: lsl r0, r4, #4 add r0, r5, r0 @@ -3128,7 +3128,7 @@ ov16_0223F48C: ; 0x0223F48C add r5, r0, #0 cmp r4, #0xf blo _0223F49A - bl sub_02022974 + bl GF_AssertFail _0223F49A: ldr r1, _0223F4AC ; =0x000023FF mov r0, #0xe0 @@ -3351,7 +3351,7 @@ _0223F612: _0223F620: cmp r6, #0x1c bls _0223F628 - bl sub_02022974 + bl GF_AssertFail _0223F628: add r0, r6, #0 add sp, #8 @@ -4403,7 +4403,7 @@ _0223FDBA: strh r0, [r4, #2] pop {r4, r5, r6, pc} _0223FDDE: - bl sub_02022974 + bl GF_AssertFail _0223FDE2: pop {r4, r5, r6, pc} thumb_func_end ov16_0223FBE8 @@ -5148,7 +5148,7 @@ _0224041E: bl ov16_02240460 pop {r3, r4, r5, pc} _0224045A: - bl sub_02022974 + bl GF_AssertFail _0224045E: pop {r3, r4, r5, pc} thumb_func_end ov16_0223FDE4 diff --git a/asm/ov16_022405FC.s b/asm/ov16_022405FC.s index 5133e3ba62..8c3cd5bb43 100644 --- a/asm/ov16_022405FC.s +++ b/asm/ov16_022405FC.s @@ -3870,7 +3870,7 @@ _022423C8: str r0, [r4, #0] b _022423FA _022423D2: - bl sub_02022974 + bl GF_AssertFail b _022423FA _022423D8: ldr r0, [r4, #0] @@ -3891,7 +3891,7 @@ _022423EE: str r0, [r4, #0] b _022423FA _022423F6: - bl sub_02022974 + bl GF_AssertFail _022423FA: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -4780,7 +4780,7 @@ _02242AD8: str r0, [sp, #0xc] b _02242B04 _02242AE2: - bl sub_02022974 + bl GF_AssertFail b _02242B04 _02242AE8: sub r0, r0, r4 @@ -4798,7 +4798,7 @@ _02242AFA: str r0, [sp, #0xc] b _02242B04 _02242B00: - bl sub_02022974 + bl GF_AssertFail _02242B04: cmp r6, #0x1a bne _02242B1A @@ -5147,7 +5147,7 @@ _02242DA8: str r0, [r4, #0] b _02242DB6 _02242DB2: - bl sub_02022974 + bl GF_AssertFail _02242DB6: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -5309,7 +5309,7 @@ _02242ED8: str r0, [sp, #0xc] b _02242EE6 _02242EE2: - bl sub_02022974 + bl GF_AssertFail _02242EE6: cmp r5, #0x11 beq _02242F16 @@ -14683,7 +14683,7 @@ _0224781E: ldr r0, [sp, #0xc] cmp r0, #0xa blt _02247828 - bl sub_02022974 + bl GF_AssertFail _02247828: add r0, r7, #0 bl ov16_0223F4BC @@ -15411,7 +15411,7 @@ _02247DCE: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _02247DDA: - bl sub_02022974 + bl GF_AssertFail _02247DDE: ldr r0, _02247E0C ; =0x00002D90 add r1, r5, r6 @@ -15472,7 +15472,7 @@ _02247E44: _02247E4E: cmp r4, #0 bne _02247E56 - bl sub_02022974 + bl GF_AssertFail _02247E56: add r0, r6, #0 bl ov16_0223F4BC @@ -21180,7 +21180,7 @@ _0224ABD4: _0224ABDA: cmp r5, #0xff bne _0224ABE2 - bl sub_02022974 + bl GF_AssertFail _0224ABE2: add r0, r5, #0 add sp, #0x10 diff --git a/asm/ov16_0224B940.s b/asm/ov16_0224B940.s index 6b015b673e..8fbd7140bc 100644 --- a/asm/ov16_0224B940.s +++ b/asm/ov16_0224B940.s @@ -8334,7 +8334,7 @@ _0224F91E: ldr r0, [r4, r0] cmp r0, #0 blt _0224F940 - bl sub_02022974 + bl GF_AssertFail _0224F940: ldr r1, [r4, #0x64] add r0, r7, #0 diff --git a/asm/ov16_0225177C.s b/asm/ov16_0225177C.s index 9175149deb..7be051cc14 100644 --- a/asm/ov16_0225177C.s +++ b/asm/ov16_0225177C.s @@ -774,7 +774,7 @@ ov16_02251E1C: ; 0x02251E1C lsl r1, r1, #6 cmp r0, r1 blo _02251E38 - bl sub_02022974 + bl GF_AssertFail _02251E38: add r0, r5, #0 add r0, #0xac @@ -808,14 +808,14 @@ ov16_02251E5C: ; 0x02251E5C lsl r1, r1, #6 cmp r0, r1 blo _02251E78 - bl sub_02022974 + bl GF_AssertFail _02251E78: add r0, r5, #0 add r0, #0xb8 ldr r0, [r0, #0] cmp r0, #4 blt _02251E86 - bl sub_02022974 + bl GF_AssertFail _02251E86: add r1, r5, #0 add r1, #0xb8 @@ -948,7 +948,7 @@ _02251F6C: _02251F74: cmp r3, #0x10 blt _02251F7C - bl sub_02022974 + bl GF_AssertFail _02251F7C: pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -962,7 +962,7 @@ ov16_02251F80: ; 0x02251F80 str r2, [sp] add r4, r3, #0 bne _02251F90 - bl sub_02022974 + bl GF_AssertFail _02251F90: ldr r0, [sp] lsl r6, r5, #6 @@ -992,7 +992,7 @@ _02251FB6: _02251FBE: cmp r2, #0x10 blt _02251FC6 - bl sub_02022974 + bl GF_AssertFail _02251FC6: pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov16_02251F80 @@ -1618,7 +1618,7 @@ _022523D4: bl ov16_02252060 pop {r4, r5, r6, pc} _022523DE: - bl sub_02022974 + bl GF_AssertFail _022523E2: mov r0, #0 pop {r4, r5, r6, pc} @@ -1921,7 +1921,7 @@ _022525F4: strb r1, [r0] pop {r4, r5, r6, pc} _02252600: - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} _02252606: ldrb r0, [r3] @@ -2469,7 +2469,7 @@ _022529F4: bl ov16_022523E8 pop {r4, r5, r6, pc} _022529FE: - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} ; .align 2, 0 _02252A04: .word 0xF87FFFFF @@ -3100,7 +3100,7 @@ _02252E60: strb r0, [r4] pop {r4, r5, r6, pc} _02252E82: - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} ; .align 2, 0 _02252E88: .word 0xFFFFFC1F @@ -4338,7 +4338,7 @@ _02253810: _0225381A: cmp r6, #0 bne _02253822 - bl sub_02022974 + bl GF_AssertFail _02253822: ldr r0, [sp] bl ov16_0223F4BC @@ -4408,7 +4408,7 @@ _0225389A: _022538A4: cmp r7, #0 bne _022538AC - bl sub_02022974 + bl GF_AssertFail _022538AC: ldr r0, [sp] bl ov16_0223F4BC @@ -18388,7 +18388,7 @@ ov16_0225A280: ; 0x0225A280 cmp r0, #1 beq _0225A2A4 bhi _0225A2A4 - bl sub_02022974 + bl GF_AssertFail _0225A2A4: add r0, sp, #0x90 ldrb r0, [r0, #0x1c] @@ -18640,7 +18640,7 @@ _0225A4C8: ldr r0, [r5, r0] cmp r0, #0xa bge _0225A4D4 - bl sub_02022974 + bl GF_AssertFail _0225A4D4: ldr r0, _0225A72C ; =0x00002158 mov r1, #0xa @@ -20797,7 +20797,7 @@ _0225B518: ldr r0, [r4, #0xc] pop {r4, pc} _0225B51C: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} ; .align 2, 0 @@ -20881,7 +20881,7 @@ _0225B5B6: strb r4, [r1, r0] pop {r3, r4, r5, pc} _0225B5BE: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} ; .align 2, 0 _0225B5C4: .word 0xFFFF8FFF @@ -20938,7 +20938,7 @@ _0225B61C: _0225B622: cmp r4, #0x91 blo _0225B62A - bl sub_02022974 + bl GF_AssertFail _0225B62A: ldr r0, _0225B638 ; =0x0226EE24 lsl r1, r4, #2 @@ -21116,7 +21116,7 @@ _0225B74A: ldrb r4, [r1, r0] b _0225B75E _0225B75A: - bl sub_02022974 + bl GF_AssertFail _0225B75E: mov r0, #0xc0 mul r0, r6 diff --git a/asm/ov16_0225CBB8.s b/asm/ov16_0225CBB8.s index fbbc32ae2c..a248233df5 100644 --- a/asm/ov16_0225CBB8.s +++ b/asm/ov16_0225CBB8.s @@ -1889,7 +1889,7 @@ ov16_0225DA74: ; 0x0225DA74 add r5, r2, #0 cmp r0, #0 bne _0225DA86 - bl sub_02022974 + bl GF_AssertFail _0225DA86: add r4, r6, #0 add r4, #0x28 @@ -1958,7 +1958,7 @@ ov16_0225DB00: ; 0x0225DB00 add r5, r2, #0 cmp r0, #0 bne _0225DB12 - bl sub_02022974 + bl GF_AssertFail _0225DB12: add r4, r6, #0 add r4, #0x28 @@ -2260,7 +2260,7 @@ ov16_0225DD44: ; 0x0225DD44 add r4, r2, #0 cmp r0, #0 bne _0225DD56 - bl sub_02022974 + bl GF_AssertFail _0225DD56: ldrb r1, [r4, #1] add r0, r5, #0 @@ -7780,7 +7780,7 @@ _022609F4: bl sub_02006CA8 b _02260A16 _02260A12: - bl sub_02022974 + bl GF_AssertFail _02260A16: add r0, r6, #0 bl ov16_02269218 @@ -8595,7 +8595,7 @@ ov16_022610A8: ; 0x022610A8 add r4, r0, #1 cmp r4, #5 blt _022610CA - bl sub_02022974 + bl GF_AssertFail _022610CA: ldrb r1, [r5, #0xd] ldr r0, [r5, #0] @@ -11152,7 +11152,7 @@ _02262544: bl ov16_02268C04 b _0226255E _0226255A: - bl sub_02022974 + bl GF_AssertFail _0226255E: mov r0, #2 strb r0, [r4, #0xe] @@ -13316,7 +13316,7 @@ ov16_02263688: ; 0x02263688 ldr r0, [r0, #0] cmp r0, #0 beq _022636A2 - bl sub_02022974 + bl GF_AssertFail _022636A2: ldrb r2, [r4, #0xd] ldr r0, [r4, #0] @@ -13352,7 +13352,7 @@ ov16_022636D4: ; 0x022636D4 ldr r0, [r0, #0] cmp r0, #0 bne _022636E8 - bl sub_02022974 + bl GF_AssertFail _022636E8: ldr r0, [r4, #4] add r0, #0x8c diff --git a/asm/ov16_0226485C.s b/asm/ov16_0226485C.s index 87cff784c2..bf2a605bab 100644 --- a/asm/ov16_0226485C.s +++ b/asm/ov16_0226485C.s @@ -4060,7 +4060,7 @@ ov16_022666E0: ; 0x022666E0 ldrh r0, [r1, #2] cmp r0, #0x1c blo _02266724 - bl sub_02022974 + bl GF_AssertFail _02266724: mov r0, #0x20 str r0, [sp] @@ -4272,7 +4272,7 @@ _02266884: ldrh r0, [r1, #2] cmp r0, #0x1c blo _022668B4 - bl sub_02022974 + bl GF_AssertFail _022668B4: mov r0, #0x20 str r0, [sp] @@ -4318,7 +4318,7 @@ ov16_022668D0: ; 0x022668D0 ldrh r0, [r1, #2] cmp r0, #0x1c blo _02266912 - bl sub_02022974 + bl GF_AssertFail _02266912: mov r0, #0x20 str r0, [sp] @@ -4512,7 +4512,7 @@ ov16_02266A38: ; 0x02266A38 ldrh r0, [r1, #2] cmp r0, #0x1c bls _02266A86 - bl sub_02022974 + bl GF_AssertFail _02266A86: mov r0, #0x24 str r0, [sp] diff --git a/asm/ov16_02266F1C.s b/asm/ov16_02266F1C.s index 40c4ce6f44..865b5de568 100644 --- a/asm/ov16_02266F1C.s +++ b/asm/ov16_02266F1C.s @@ -191,7 +191,7 @@ ov16_02267084: ; 0x02267084 add r4, r2, #0 cmp r0, #0 bne _02267096 - bl sub_02022974 + bl GF_AssertFail _02267096: add r0, r5, #0 add r0, #0x25 @@ -956,7 +956,7 @@ ov16_0226763C: ; 0x0226763C add r7, r2, #0 cmp r0, #0 bne _0226764E - bl sub_02022974 + bl GF_AssertFail _0226764E: add r0, r5, #0 add r0, #0x25 @@ -1009,12 +1009,12 @@ ov16_022676A8: ; 0x022676A8 add r5, r1, #0 cmp r4, #0 bne _022676B6 - bl sub_02022974 + bl GF_AssertFail _022676B6: ldr r0, [r4, #4] cmp r0, #0 bne _022676C0 - bl sub_02022974 + bl GF_AssertFail _022676C0: add r0, r4, #0 add r0, #0x4f @@ -2538,7 +2538,7 @@ _022682A4: mov r0, #5 pop {r3, pc} _022682A8: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} thumb_func_end ov16_0226825C @@ -2585,7 +2585,7 @@ _022682EA: ldr r0, _02268310 ; =0x0226F57C pop {r3, pc} _022682EE: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} nop @@ -2625,7 +2625,7 @@ _0226833A: mov r0, #0 pop {r3, pc} _0226833E: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} nop diff --git a/asm/ov16_02268520.s b/asm/ov16_02268520.s index c37d8465ac..89619c110a 100644 --- a/asm/ov16_02268520.s +++ b/asm/ov16_02268520.s @@ -231,7 +231,7 @@ ov16_022686CC: ; 0x022686CC strb r7, [r5, #9] cmp r7, #0x18 blt _022686F2 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 strb r0, [r5, #9] _022686F2: diff --git a/asm/ov16_0226871C.s b/asm/ov16_0226871C.s index 62104d92e0..ce62ec42ab 100644 --- a/asm/ov16_0226871C.s +++ b/asm/ov16_0226871C.s @@ -125,7 +125,7 @@ _022687EC: blo _02268808 mov r0, #0 str r0, [sp, #0x14] - bl sub_02022974 + bl GF_AssertFail _02268808: mov r0, #0xd mov r1, #5 @@ -759,7 +759,7 @@ ov16_02268D40: ; 0x02268D40 cmp r0, #0 beq _02268D60 _02268D5C: - bl sub_02022974 + bl GF_AssertFail _02268D60: ldr r0, [sp, #0x14] ldr r0, [r0, #0] @@ -882,7 +882,7 @@ _02268DFE: ldr r0, [r0, #8] cmp r0, #0 beq _02268E70 - bl sub_02022974 + bl GF_AssertFail _02268E70: ldr r0, _02268EE8 ; =ov16_02268FCC ldr r1, [sp, #0x14] @@ -955,7 +955,7 @@ ov16_02268F00: ; 0x02268F00 cmp r0, #0 bne _02268F18 _02268F14: - bl sub_02022974 + bl GF_AssertFail _02268F18: ldr r0, [r6, #0] bl ov16_0223E010 @@ -1300,7 +1300,7 @@ ov16_022691BC: ; 0x022691BC cmp r0, #0 bne _022691D4 _022691D0: - bl sub_02022974 + bl GF_AssertFail _022691D4: ldr r7, _02269214 ; =0x000005D8 mov r6, #0 @@ -1351,7 +1351,7 @@ ov16_02269218: ; 0x02269218 cmp r0, #0 bne _02269230 _0226922C: - bl sub_02022974 + bl GF_AssertFail _02269230: ldr r7, _02269258 ; =0x000005D8 mov r4, #0 @@ -1385,7 +1385,7 @@ ov16_0226925C: ; 0x0226925C sub r0, r6, #1 cmp r1, r0 bne _02269270 - bl sub_02022974 + bl GF_AssertFail _02269270: ldr r0, _02269338 ; =0x0000068B ldr r3, _0226933C ; =0x02270670 @@ -1408,7 +1408,7 @@ _02269290: ldr r0, [r4, #0x18] cmp r0, #0 bne _0226929A - bl sub_02022974 + bl GF_AssertFail _0226929A: ldr r0, [r5, #0] bl ov16_0223DF0C @@ -1615,7 +1615,7 @@ _02269400: mov r0, #0xb pop {r3, pc} _02269404: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} thumb_func_end ov16_02269368 @@ -1874,7 +1874,7 @@ ov16_02269550: ; 0x02269550 bl sub_020177BC cmp r0, #1 beq _02269616 - bl sub_02022974 + bl GF_AssertFail _02269616: ldr r0, _02269650 ; =ov16_0226BA88 add r1, r4, #0 @@ -2295,7 +2295,7 @@ ov16_022699AC: ; 0x022699AC add r6, r5, #0 add r6, #0x1c bne _022699BC - bl sub_02022974 + bl GF_AssertFail _022699BC: ldrb r1, [r6, #0x10] ldr r0, _02269C3C ; =0x0000068A @@ -3970,7 +3970,7 @@ _0226A7BA: ldr r0, [r1, r0] cmp r0, #0 beq _0226A7CA - bl sub_02022974 + bl GF_AssertFail _0226A7CA: lsl r0, r5, #2 add r1, r4, r0 @@ -3978,7 +3978,7 @@ _0226A7CA: ldr r0, [r1, r0] cmp r0, #0 beq _0226A7DA - bl sub_02022974 + bl GF_AssertFail _0226A7DA: cmp r6, #5 bhi _0226A802 @@ -4005,7 +4005,7 @@ _0226A7FE: ldr r6, _0226A914 ; =0x00004E46 b _0226A80C _0226A802: - bl sub_02022974 + bl GF_AssertFail add sp, #0x50 mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -4219,7 +4219,7 @@ ov16_0226A98C: ; 0x0226A98C ldr r4, [sp, #0xa8] cmp r0, #0 beq _0226A9A6 - bl sub_02022974 + bl GF_AssertFail _0226A9A6: ldr r0, [r7, #0] bl ov16_0223E018 @@ -4953,7 +4953,7 @@ _0226AF4C: ldr r0, [r1, r0] cmp r0, #0 beq _0226AF5C - bl sub_02022974 + bl GF_AssertFail _0226AF5C: ldr r0, [sp, #4] lsl r1, r4, #1 @@ -5409,7 +5409,7 @@ ov16_0226B2BC: ; 0x0226B2BC ldr r0, [r4, #0xc] cmp r0, #0 beq _0226B2CC - bl sub_02022974 + bl GF_AssertFail _0226B2CC: ldr r0, _0226B2E8 ; =0x0000069C mov r1, #0 @@ -8934,7 +8934,7 @@ ov16_0226CD18: ; 0x0226CD18 ldrb r0, [r4, r0] cmp r0, #2 blo _0226CD44 - bl sub_02022974 + bl GF_AssertFail _0226CD44: ldr r1, _0226CD78 ; =0x000006E8 add r0, r4, #0 @@ -9143,7 +9143,7 @@ ov16_0226CEB0: ; 0x0226CEB0 ldrsb r0, [r0, r1] cmp r0, #0x12 beq _0226CED8 - bl sub_02022974 + bl GF_AssertFail _0226CED8: mov r0, #0 str r0, [sp] @@ -9297,7 +9297,7 @@ _0226D018: ldr r0, [r6, r0] cmp r0, #0 beq _0226D028 - bl sub_02022974 + bl GF_AssertFail add sp, #0x38 pop {r3, r4, r5, r6, r7, pc} _0226D028: diff --git a/asm/ov16_0226D094.s b/asm/ov16_0226D094.s index 5724631adc..6b9b7be0b0 100644 --- a/asm/ov16_0226D094.s +++ b/asm/ov16_0226D094.s @@ -120,7 +120,7 @@ ov16_0226D17C: ; 0x0226D17C ldr r0, [r4, #4] cmp r0, #0 beq _0226D18A - bl sub_02022974 + bl GF_AssertFail _0226D18A: add r0, r4, #0 bl sub_020181C4 @@ -214,7 +214,7 @@ ov16_0226D220: ; 0x0226D220 add r7, r2, #0 cmp r6, #0 bne _0226D230 - bl sub_02022974 + bl GF_AssertFail _0226D230: add r0, r6, #0 add r1, r4, #0 @@ -300,7 +300,7 @@ ov16_0226D2A0: ; 0x0226D2A0 _0226D2BA: cmp r1, #0 bne _0226D2C2 - bl sub_02022974 + bl GF_AssertFail _0226D2C2: add r0, r5, #0 mov r1, #0 @@ -463,7 +463,7 @@ ov16_0226D3F8: ; 0x0226D3F8 cmp r0, #0 beq _0226D40E _0226D40A: - bl sub_02022974 + bl GF_AssertFail _0226D40E: mov r0, #0 strb r0, [r5, #0x1a] @@ -639,7 +639,7 @@ ov16_0226D540: ; 0x0226D540 _0226D55C: cmp r1, #0 bne _0226D564 - bl sub_02022974 + bl GF_AssertFail _0226D564: add r0, r5, #0 mov r1, #0 @@ -1153,7 +1153,7 @@ ov16_0226D938: ; 0x0226D938 cmp r0, #0 beq _0226D952 _0226D94E: - bl sub_02022974 + bl GF_AssertFail _0226D952: add r0, r5, #0 mov r1, #0 diff --git a/asm/ov16_0226E148.s b/asm/ov16_0226E148.s index 003b89944a..7be17c0022 100644 --- a/asm/ov16_0226E148.s +++ b/asm/ov16_0226E148.s @@ -66,7 +66,7 @@ _0226E1AA: ; jump table _0226E1B4: cmp r5, #0 bne _0226E1BC - bl sub_02022974 + bl GF_AssertFail _0226E1BC: mov r0, #7 mov r1, #5 diff --git a/asm/ov17_0223B140.s b/asm/ov17_0223B140.s index 3d539bdd30..a2efd2c00f 100644 --- a/asm/ov17_0223B140.s +++ b/asm/ov17_0223B140.s @@ -808,11 +808,11 @@ ov17_0223B884: ; 0x0223B884 add r5, r0, #0 cmp r4, #0 bne _0223B8AC - bl sub_02022974 + bl GF_AssertFail _0223B8AC: cmp r5, #0 bne _0223B8B4 - bl sub_02022974 + bl GF_AssertFail _0223B8B4: bl sub_02014000 pop {r3, r4, r5, pc} @@ -828,7 +828,7 @@ ov17_0223B8C4: ; 0x0223B8C4 ldr r0, [r4, #0] cmp r0, #0 bne _0223B8D2 - bl sub_02022974 + bl GF_AssertFail _0223B8D2: ldr r1, _0223B8F4 ; =0x00000172 mov r0, #0 diff --git a/asm/ov17_0223CB1C.s b/asm/ov17_0223CB1C.s index 948d125fa3..08f517458c 100644 --- a/asm/ov17_0223CB1C.s +++ b/asm/ov17_0223CB1C.s @@ -927,11 +927,11 @@ ov17_0223D350: ; 0x0223D350 add r5, r0, #0 cmp r4, #0 bne _0223D378 - bl sub_02022974 + bl GF_AssertFail _0223D378: cmp r5, #0 bne _0223D380 - bl sub_02022974 + bl GF_AssertFail _0223D380: bl sub_02014000 pop {r3, r4, r5, pc} @@ -947,7 +947,7 @@ ov17_0223D390: ; 0x0223D390 ldr r0, [r4, #0] cmp r0, #0 bne _0223D39E - bl sub_02022974 + bl GF_AssertFail _0223D39E: mov r3, #0 mov r0, #3 diff --git a/asm/ov17_0223DAD0.s b/asm/ov17_0223DAD0.s index e8434ae0b9..6e3dc53ef7 100644 --- a/asm/ov17_0223DAD0.s +++ b/asm/ov17_0223DAD0.s @@ -471,7 +471,7 @@ ov17_0223DF0C: ; 0x0223DF0C bl sub_02014710 cmp r0, #0 beq _0223DF24 - bl sub_02022974 + bl GF_AssertFail _0223DF24: add r0, r4, #0 bl ov17_0223E7E0 @@ -1088,7 +1088,7 @@ ov17_0223E458: ; 0x0223E458 ldr r0, [r5, #0] cmp r0, #0 bne _0223E466 - bl sub_02022974 + bl GF_AssertFail _0223E466: ldr r4, _0223E4AC ; =0x00000AEC mov r1, #0 @@ -1469,7 +1469,7 @@ ov17_0223E778: ; 0x0223E778 ldr r0, [r4, #0xc] cmp r0, #0 beq _0223E788 - bl sub_02022974 + bl GF_AssertFail _0223E788: mov r1, #0x12 mov r0, #0x17 @@ -2725,7 +2725,7 @@ _0223F0FC: ldrh r0, [r0, r1] pop {r3, pc} _0223F104: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 diff --git a/asm/ov17_0223F118.s b/asm/ov17_0223F118.s index 2ddcdea3cb..6fad70f755 100644 --- a/asm/ov17_0223F118.s +++ b/asm/ov17_0223F118.s @@ -522,7 +522,7 @@ _0223F50E: mov r6, #0x69 b _0223F51A _0223F512: - bl sub_02022974 + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} _0223F51A: @@ -823,7 +823,7 @@ ov17_0223F744: ; 0x0223F744 ldr r0, [r4, #0] cmp r0, #0 bne _0223F752 - bl sub_02022974 + bl GF_AssertFail _0223F752: ldr r0, [r4, #0] bl sub_0200DA58 diff --git a/asm/ov17_0223F7E4.s b/asm/ov17_0223F7E4.s index 24242222ec..37cb4bf5d0 100644 --- a/asm/ov17_0223F7E4.s +++ b/asm/ov17_0223F7E4.s @@ -410,7 +410,7 @@ ov17_0223FAF8: ; 0x0223FAF8 sub r0, r6, #1 cmp r1, r0 bne _0223FB0E - bl sub_02022974 + bl GF_AssertFail _0223FB0E: mov r0, #0x2e lsl r0, r0, #4 @@ -429,7 +429,7 @@ _0223FB28: ldr r0, [r4, #0x18] cmp r0, #0 bne _0223FB32 - bl sub_02022974 + bl GF_AssertFail _0223FB32: ldr r0, [r4, #0x14] bl sub_02022664 @@ -850,7 +850,7 @@ _0223FE38: ldrb r0, [r6, r0] cmp r0, #0xff beq _0223FE78 - bl sub_02022974 + bl GF_AssertFail _0223FE78: ldr r0, _0223FF18 ; =0x000002E1 strb r4, [r6, r0] @@ -883,7 +883,7 @@ _0223FEA8: str r0, [sp, #0x1c] cmp r0, #6 ble _0223FEB8 - bl sub_02022974 + bl GF_AssertFail _0223FEB8: mov r0, #0x18 mul r0, r4 @@ -903,7 +903,7 @@ _0223FECC: ldr r0, [r1, r0] cmp r0, #0 beq _0223FEDE - bl sub_02022974 + bl GF_AssertFail _0223FEDE: ldr r0, [sp, #0x20] ldr r3, _0223FF34 ; =0x02253334 @@ -1222,7 +1222,7 @@ ov17_02240138: ; 0x02240138 ldr r4, [sp, #0xa8] cmp r0, #0 beq _02240152 - bl sub_02022974 + bl GF_AssertFail _02240152: ldr r1, [r7, #4] cmp r4, #0 @@ -1469,7 +1469,7 @@ _02240312: ldr r0, [r1, r0] cmp r0, #0 beq _02240324 - bl sub_02022974 + bl GF_AssertFail _02240324: lsl r0, r4, #1 ldrh r0, [r7, r0] @@ -1705,7 +1705,7 @@ ov17_022404CC: ; 0x022404CC ldr r0, [r4, #0x10] cmp r0, #0 beq _022404DC - bl sub_02022974 + bl GF_AssertFail _022404DC: mov r0, #0xb9 lsl r0, r0, #2 @@ -2236,7 +2236,7 @@ ov17_022408E0: ; 0x022408E0 ldr r0, [r4, #0x14] cmp r0, #0 beq _022408F0 - bl sub_02022974 + bl GF_AssertFail _022408F0: mov r0, #0xc1 lsl r0, r0, #2 diff --git a/asm/ov17_022413D8.s b/asm/ov17_022413D8.s index 3930332d04..dcbb5e44fb 100644 --- a/asm/ov17_022413D8.s +++ b/asm/ov17_022413D8.s @@ -116,7 +116,7 @@ ov17_02241494: ; 0x02241494 ldrb r0, [r4, #0xb] cmp r0, #0 beq _022414A2 - bl sub_02022974 + bl GF_AssertFail _022414A2: ldr r0, [r4, #4] bl sub_0200DA58 @@ -213,7 +213,7 @@ ov17_02241524: ; 0x02241524 ldr r0, [r0, #0x58] cmp r0, #0 bne _0224154C - bl sub_02022974 + bl GF_AssertFail _0224154C: add r2, r5, #0 add r2, #0x58 @@ -305,7 +305,7 @@ _022415FE: ldr r0, [r0, #0x58] cmp r0, #0 beq _0224160A - bl sub_02022974 + bl GF_AssertFail _0224160A: mov r1, #0x32 mov r0, #0x15 @@ -379,7 +379,7 @@ _02241682: ldr r0, [r0, #0] cmp r0, #0 beq _022416AC - bl sub_02022974 + bl GF_AssertFail _022416AC: mov r1, #0x32 mov r0, #0x15 @@ -878,7 +878,7 @@ ov17_02241A64: ; 0x02241A64 ldr r0, [r4, r0] cmp r0, #0 bne _02241A76 - bl sub_02022974 + bl GF_AssertFail _02241A76: mov r0, #0x5f lsl r0, r0, #2 @@ -903,7 +903,7 @@ ov17_02241A8C: ; 0x02241A8C add r5, r2, #0 cmp r0, #0 bne _02241AA2 - bl sub_02022974 + bl GF_AssertFail _02241AA2: ldr r1, _02241B08 ; =0x022536E4 lsl r2, r6, #2 @@ -971,7 +971,7 @@ ov17_02241B1C: ; 0x02241B1C ldr r0, [r4, r0] cmp r0, #0 bne _02241B2E - bl sub_02022974 + bl GF_AssertFail _02241B2E: mov r0, #0x5f lsl r0, r0, #2 @@ -1300,7 +1300,7 @@ ov17_02241D94: ; 0x02241D94 add r4, r2, #0 cmp r0, #0 beq _02241DAA - bl sub_02022974 + bl GF_AssertFail _02241DAA: mov r0, #1 str r0, [sp] @@ -2238,7 +2238,7 @@ ov17_022424D4: ; 0x022424D4 str r0, [sp, #4] cmp r0, #5 ble _022424F0 - bl sub_02022974 + bl GF_AssertFail _022424F0: ldr r0, [sp] mov r1, #0x14 @@ -2787,7 +2787,7 @@ ov17_0224290C: ; 0x0224290C blt _02242924 cmp r5, #0 bne _02242924 - bl sub_02022974 + bl GF_AssertFail _02242924: cmp r7, #0x1c bls _0224292A @@ -3319,7 +3319,7 @@ _02242D78: add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02242D9E: - bl sub_02022974 + bl GF_AssertFail _02242DA2: add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -3426,7 +3426,7 @@ ov17_02242E5C: ; 0x02242E5C add r6, r3, #0 cmp r5, #0x2f blo _02242E70 - bl sub_02022974 + bl GF_AssertFail _02242E70: ldr r0, _02242E90 ; =0x022538F3 lsl r3, r5, #2 @@ -3856,11 +3856,11 @@ _02243182: ldr r4, [r0, r1] cmp r4, #0 bge _02243190 - bl sub_02022974 + bl GF_AssertFail _02243190: cmp r4, #0x7f ble _02243198 - bl sub_02022974 + bl GF_AssertFail _02243198: add r0, r4, #0 pop {r4, pc} diff --git a/asm/ov17_02246ECC.s b/asm/ov17_02246ECC.s index 8f63c53ce2..ec662ae6cb 100644 --- a/asm/ov17_02246ECC.s +++ b/asm/ov17_02246ECC.s @@ -570,13 +570,13 @@ _022472C4: ldrh r0, [r0] cmp r0, #0 bne _022472E8 - bl sub_02022974 + bl GF_AssertFail _022472E8: ldr r0, [sp, #0x58] ldrb r0, [r0] cmp r0, #3 blo _022472F4 - bl sub_02022974 + bl GF_AssertFail _022472F4: add sp, #0x44 pop {r4, r5, r6, r7, pc} diff --git a/asm/ov17_022476F8.s b/asm/ov17_022476F8.s index a3fc26beb3..080b16ef68 100644 --- a/asm/ov17_022476F8.s +++ b/asm/ov17_022476F8.s @@ -21,7 +21,7 @@ ov17_022476F8: ; 0x022476F8 ldr r0, [r0, #0x48] cmp r0, #0 beq _02247732 - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _02247718: bl sub_02007DC8 @@ -253,7 +253,7 @@ ov17_022478D0: ; 0x022478D0 add r4, r1, #0 cmp r0, #0 beq _022478E2 - bl sub_02022974 + bl GF_AssertFail _022478E2: mov r1, #0x30 ldr r2, [r5, #0] @@ -307,7 +307,7 @@ ov17_0224792C: ; 0x0224792C beq _02247942 cmp r6, #0 bne _02247942 - bl sub_02022974 + bl GF_AssertFail _02247942: cmp r4, #0 beq _0224798C @@ -342,7 +342,7 @@ _02247942: add sp, #8 pop {r4, r5, r6, pc} _02247988: - bl sub_02022974 + bl GF_AssertFail _0224798C: add sp, #8 pop {r4, r5, r6, pc} @@ -414,7 +414,7 @@ ov17_02247A08: ; 0x02247A08 add r4, r2, #0 cmp r5, #0xf blo _02247A1A - bl sub_02022974 + bl GF_AssertFail _02247A1A: str r4, [sp] ldr r2, _02247A34 ; =0x0225442C diff --git a/asm/ov17_02247A48.s b/asm/ov17_02247A48.s index 07f1684585..e123ae4f4b 100644 --- a/asm/ov17_02247A48.s +++ b/asm/ov17_02247A48.s @@ -1749,7 +1749,7 @@ _02248756: ldr r0, [r0, #0x24] cmp r0, #0 bne _02248762 - bl sub_02022974 + bl GF_AssertFail _02248762: ldr r0, [r4, #0] mov r1, #0 @@ -2352,7 +2352,7 @@ _02248C04: ldr r0, [r0, #0x24] cmp r0, #0 bne _02248C10 - bl sub_02022974 + bl GF_AssertFail _02248C10: ldrb r0, [r4, #0xf] add r0, r0, #1 diff --git a/asm/ov17_022492DC.s b/asm/ov17_022492DC.s index b73b60bea1..bf5e7c6aeb 100644 --- a/asm/ov17_022492DC.s +++ b/asm/ov17_022492DC.s @@ -576,7 +576,7 @@ ov17_02249760: ; 0x02249760 sub r0, #0x97 cmp r1, r0 bne _02249772 - bl sub_02022974 + bl GF_AssertFail _02249772: mov r0, #0x96 ldrsb r1, [r5, r0] @@ -594,7 +594,7 @@ _0224978A: ldr r0, [r4, #0x18] cmp r0, #0 bne _02249794 - bl sub_02022974 + bl GF_AssertFail _02249794: ldr r0, [r4, #0x14] bl sub_02022664 @@ -1164,7 +1164,7 @@ ov17_02249BC4: ; 0x02249BC4 ldr r4, [sp, #0x9c] cmp r0, #0 beq _02249BDC - bl sub_02022974 + bl GF_AssertFail _02249BDC: ldr r0, [sp, #0x18] mov r2, #0 @@ -1367,7 +1367,7 @@ ov17_02249D50: ; 0x02249D50 ldr r0, [r4, #0xc] cmp r0, #0 beq _02249D60 - bl sub_02022974 + bl GF_AssertFail _02249D60: add r0, r4, #0 add r0, #0x98 diff --git a/asm/ov17_0224A0FC.s b/asm/ov17_0224A0FC.s index 443738a8be..32d66647a7 100644 --- a/asm/ov17_0224A0FC.s +++ b/asm/ov17_0224A0FC.s @@ -57,7 +57,7 @@ _0224A13E: ldr r0, [r0, #0] cmp r0, #0 beq _0224A14E - bl sub_02022974 + bl GF_AssertFail _0224A14E: add r4, r4, #1 _0224A150: @@ -612,7 +612,7 @@ _0224A558: add r2, r2, #4 cmp r0, #0x44 blt _0224A542 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 add sp, #0x34 pop {r4, r5, r6, r7, pc} @@ -2722,7 +2722,7 @@ _0224B572: mvn r4, r4 cmp r0, r4 bne _0224B580 - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} _0224B580: strb r3, [r1, r0] @@ -2970,7 +2970,7 @@ _0224B71C: add r6, r0, #0 b _0224B74E _0224B74A: - bl sub_02022974 + bl GF_AssertFail _0224B74E: cmp r6, #1 bne _0224B792 @@ -3667,7 +3667,7 @@ ov17_0224BC68: ; 0x0224BC68 str r2, [sp] cmp r0, #0 beq _0224BC86 - bl sub_02022974 + bl GF_AssertFail _0224BC86: ldr r0, _0224BCF0 ; =0x00001088 mov r2, #0x28 @@ -3854,7 +3854,7 @@ _0224BDD2: strb r0, [r2, r3] pop {r3, r4, r5, pc} _0224BDE4: - bl sub_02022974 + bl GF_AssertFail _0224BDE8: pop {r3, r4, r5, pc} nop @@ -4249,7 +4249,7 @@ ov17_0224C0C0: ; 0x0224C0C0 beq _0224C0D6 cmp r5, #0 bne _0224C0D6 - bl sub_02022974 + bl GF_AssertFail _0224C0D6: cmp r6, #6 bls _0224C0DC @@ -4422,7 +4422,7 @@ _0224C1C2: add sp, #8 pop {r4, r5, r6, pc} _0224C23C: - bl sub_02022974 + bl GF_AssertFail _0224C240: add sp, #8 pop {r4, r5, r6, pc} @@ -4501,7 +4501,7 @@ ov17_0224C2CC: ; 0x0224C2CC add r6, r2, #0 cmp r4, #8 blo _0224C2DE - bl sub_02022974 + bl GF_AssertFail _0224C2DE: lsl r3, r4, #2 ldr r2, _0224C2F8 ; =0x0225470C @@ -4597,7 +4597,7 @@ ov17_0224C384: ; 0x0224C384 ldr r0, [r5, r0] cmp r0, #0 beq _0224C396 - bl sub_02022974 + bl GF_AssertFail _0224C396: mov r0, #0x17 mov r1, #0x10 @@ -4875,7 +4875,7 @@ ov17_0224C5A0: ; 0x0224C5A0 add r7, r2, #0 cmp r4, #8 blo _0224C5B2 - bl sub_02022974 + bl GF_AssertFail _0224C5B2: ldr r0, _0224C634 ; =0x00001C0D ldrb r0, [r5, r0] @@ -5410,7 +5410,7 @@ ov17_0224C9A4: ; 0x0224C9A4 ldr r0, [r4, r0] cmp r0, #0 beq _0224C9B6 - bl sub_02022974 + bl GF_AssertFail _0224C9B6: mov r0, #0x81 lsl r0, r0, #2 @@ -5455,7 +5455,7 @@ ov17_0224C9F0: ; 0x0224C9F0 ldr r0, [r4, #4] cmp r0, #0 bne _0224CA04 - bl sub_02022974 + bl GF_AssertFail _0224CA04: cmp r5, #0 bne _0224CA0C diff --git a/asm/ov17_0224CFB8.s b/asm/ov17_0224CFB8.s index bdbbb2c226..0b97c13dd8 100644 --- a/asm/ov17_0224CFB8.s +++ b/asm/ov17_0224CFB8.s @@ -1794,7 +1794,7 @@ _0224DD4E: mov r0, #4 pop {r3, pc} _0224DD52: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -1830,7 +1830,7 @@ _0224DD84: mov r0, #3 pop {r3, pc} _0224DD88: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} thumb_func_end ov17_0224DD5C diff --git a/asm/ov17_0224E930.s b/asm/ov17_0224E930.s index 4c9d4033d8..cdfde7b12d 100644 --- a/asm/ov17_0224E930.s +++ b/asm/ov17_0224E930.s @@ -368,7 +368,7 @@ ov17_0224EBE0: ; 0x0224EBE0 add r4, r0, #0 cmp r5, #4 blo _0224EBEE - bl sub_02022974 + bl GF_AssertFail _0224EBEE: ldr r0, _0224EC20 ; =0x02254A80 cmp r4, #3 @@ -413,7 +413,7 @@ ov17_0224EC24: ; 0x0224EC24 ldr r4, [sp, #0x18] cmp r0, #4 blo _0224EC3A - bl sub_02022974 + bl GF_AssertFail _0224EC3A: mov r0, #0 mvn r0, r0 diff --git a/asm/ov17_0224F080.s b/asm/ov17_0224F080.s index 99a9be4d43..65c03f3101 100644 --- a/asm/ov17_0224F080.s +++ b/asm/ov17_0224F080.s @@ -12,7 +12,7 @@ ov17_0224F080: ; 0x0224F080 add r4, r0, #0 cmp r4, #5 blo _0224F08C - bl sub_02022974 + bl GF_AssertFail _0224F08C: ldr r0, _0224F094 ; =0x02254A90 lsl r1, r4, #2 @@ -40,7 +40,7 @@ ov17_0224F0A0: ; 0x0224F0A0 add r4, r0, #0 cmp r4, #5 blo _0224F0AC - bl sub_02022974 + bl GF_AssertFail _0224F0AC: ldr r0, _0224F0B4 ; =0x02254A88 ldrb r0, [r0, r4] diff --git a/asm/ov17_0224F18C.s b/asm/ov17_0224F18C.s index ee0bbd4e29..ca7ef51a66 100644 --- a/asm/ov17_0224F18C.s +++ b/asm/ov17_0224F18C.s @@ -50,7 +50,7 @@ _0224F1D0: add r4, r4, #1 cmp r4, #0x20 blt _0224F1BC - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} ; .align 2, 0 @@ -87,7 +87,7 @@ ov17_0224F1F8: ; 0x0224F1F8 str r3, [sp] cmp r4, r0 bls _0224F216 - bl sub_02022974 + bl GF_AssertFail _0224F216: add r0, r5, #0 mov r2, #2 @@ -143,7 +143,7 @@ ov17_0224F26C: ; 0x0224F26C str r3, [sp] cmp r7, r0 bls _0224F288 - bl sub_02022974 + bl GF_AssertFail _0224F288: add r0, r5, #0 mov r2, #2 @@ -236,7 +236,7 @@ _0224F322: ldrh r0, [r5, #4] cmp r4, r0 blt _0224F32C - bl sub_02022974 + bl GF_AssertFail _0224F32C: add r0, r5, #0 add r1, r6, #0 diff --git a/asm/ov17_0224F4D4.s b/asm/ov17_0224F4D4.s index 01a34f20a4..876753e0d1 100644 --- a/asm/ov17_0224F4D4.s +++ b/asm/ov17_0224F4D4.s @@ -1032,11 +1032,11 @@ ov17_0224FDDC: ; 0x0224FDDC add r5, r0, #0 cmp r4, #0 bne _0224FE04 - bl sub_02022974 + bl GF_AssertFail _0224FE04: cmp r5, #0 bne _0224FE0C - bl sub_02022974 + bl GF_AssertFail _0224FE0C: bl sub_02014000 pop {r3, r4, r5, pc} @@ -1052,7 +1052,7 @@ ov17_0224FE1C: ; 0x0224FE1C ldr r0, [r4, #0] cmp r0, #0 bne _0224FE2A - bl sub_02022974 + bl GF_AssertFail _0224FE2A: mov r1, #0xf3 mov r5, #0 @@ -1196,7 +1196,7 @@ _0224FEEE: _0224FEFC: cmp r5, #4 bne _0224FF04 - bl sub_02022974 + bl GF_AssertFail _0224FF04: ldr r0, _0224FFD4 ; =0x00000438 ldr r1, _0224FFD8 ; =0x00000439 diff --git a/asm/ov17_02250744.s b/asm/ov17_02250744.s index 117823debb..e6b39f0f53 100644 --- a/asm/ov17_02250744.s +++ b/asm/ov17_02250744.s @@ -26,7 +26,7 @@ _02250752: ldr r0, [r0, #0] cmp r0, #0 beq _0225076A - bl sub_02022974 + bl GF_AssertFail _0225076A: mov r1, #0x32 mov r0, #0x18 @@ -109,7 +109,7 @@ ov17_022507F0: ; 0x022507F0 beq _02250806 cmp r5, #0 bne _02250806 - bl sub_02022974 + bl GF_AssertFail _02250806: cmp r6, #3 bhi _022508DC @@ -214,7 +214,7 @@ _02250886: add sp, #8 pop {r4, r5, r6, pc} _022508DC: - bl sub_02022974 + bl GF_AssertFail _022508E0: add sp, #8 pop {r4, r5, r6, pc} @@ -293,7 +293,7 @@ ov17_02250968: ; 0x02250968 add r6, r2, #0 cmp r4, #7 blo _0225097A - bl sub_02022974 + bl GF_AssertFail _0225097A: lsl r3, r4, #2 ldr r2, _02250994 ; =0x02254C0C @@ -1636,7 +1636,7 @@ _02251438: add r4, r2, r0 b _02251460 _02251458: - bl sub_02022974 + bl GF_AssertFail add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} _02251460: @@ -1668,7 +1668,7 @@ _02251490: ldr r0, [sp, #0xc] cmp r0, #0xc ble _0225149A - bl sub_02022974 + bl GF_AssertFail _0225149A: mov r0, #0 str r0, [sp, #8] @@ -2339,7 +2339,7 @@ _02251974: str r0, [r4, #0] b _02251984 _0225197C: - bl sub_02022974 + bl GF_AssertFail add sp, #0x34 pop {r4, r5, r6, r7, pc} _02251984: diff --git a/asm/ov17_02251D6C.s b/asm/ov17_02251D6C.s index c17bbca056..ae8aea4dbe 100644 --- a/asm/ov17_02251D6C.s +++ b/asm/ov17_02251D6C.s @@ -1467,7 +1467,7 @@ _02252824: blt _02252824 b _02252838 _02252834: - bl sub_02022974 + bl GF_AssertFail _02252838: ldr r0, _02252850 ; =ov17_02252858 ldr r2, _02252854 ; =0x00007530 diff --git a/asm/ov17_02252CEC.s b/asm/ov17_02252CEC.s index b6ce880fa8..e16703e143 100644 --- a/asm/ov17_02252CEC.s +++ b/asm/ov17_02252CEC.s @@ -48,21 +48,21 @@ _02252D26: add r4, r1, r0 b _02252D3A _02252D34: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _02252D3A: mov r0, #2 lsl r0, r0, #8 cmp r6, r0 ble _02252D46 - bl sub_02022974 + bl GF_AssertFail _02252D46: ldr r0, _02252D78 ; =0x00000A11 add r7, r4, r0 ldrb r0, [r7, r5] cmp r0, #0 beq _02252D54 - bl sub_02022974 + bl GF_AssertFail _02252D54: mov r1, #0x21 lsl r1, r1, #4 diff --git a/asm/ov19_021D0D80.s b/asm/ov19_021D0D80.s index a445cd2d3a..0a3365db48 100644 --- a/asm/ov19_021D0D80.s +++ b/asm/ov19_021D0D80.s @@ -105,7 +105,7 @@ _021D0E3E: blx r1 pop {r4, pc} _021D0E4A: - bl sub_02022974 + bl GF_AssertFail mov r0, #1 pop {r4, pc} nop @@ -3504,7 +3504,7 @@ _021D29D4: str r0, [r5, #0] pop {r3, r4, r5, pc} _021D2A16: - bl sub_02022974 + bl GF_AssertFail mov r0, #1 str r0, [r5, #0] pop {r3, r4, r5, pc} @@ -7778,7 +7778,7 @@ ov19_021D4BE0: ; 0x021D4BE0 ldr r0, [r5, r0] cmp r0, #0 bne _021D4C88 - bl sub_02022974 + bl GF_AssertFail _021D4C88: mov r0, #0x69 lsl r0, r0, #2 @@ -8608,7 +8608,7 @@ _021D5276: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021D5286: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 diff --git a/asm/ov19_021D61B0.s b/asm/ov19_021D61B0.s index b47df2828a..ff9d029724 100644 --- a/asm/ov19_021D61B0.s +++ b/asm/ov19_021D61B0.s @@ -471,7 +471,7 @@ _021D65A2: str r0, [r1, #8] pop {r3, r4, r5, r6, r7, pc} _021D65E0: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _021D65E6: add r4, r4, #1 @@ -480,7 +480,7 @@ _021D65E6: blo _021D65A2 pop {r3, r4, r5, r6, r7, pc} _021D65F0: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} nop _021D65F8: .word 0x021DFF9C @@ -3129,7 +3129,7 @@ ov19_021D79B8: ; 0x021D79B8 add r6, r2, #0 cmp r0, #0x20 blo _021D79CC - bl sub_02022974 + bl GF_AssertFail _021D79CC: ldr r2, _021D79E8 ; =0x021E05EC mov r1, #0xc diff --git a/asm/ov19_021DA270.s b/asm/ov19_021DA270.s index 7e08017c21..d911627ab9 100644 --- a/asm/ov19_021DA270.s +++ b/asm/ov19_021DA270.s @@ -344,7 +344,7 @@ ov19_021DA428: ; 0x021DA428 str r0, [r4, #0] cmp r0, #0 bne _021DA51E - bl sub_02022974 + bl GF_AssertFail _021DA51E: ldrh r1, [r4, #0x2c] ldr r0, [r4, #0] @@ -453,7 +453,7 @@ ov19_021DA548: ; 0x021DA548 str r0, [r4, #0] cmp r0, #0 bne _021DA610 - bl sub_02022974 + bl GF_AssertFail _021DA610: ldrh r1, [r4, #0x2c] ldr r0, [r4, #0] diff --git a/asm/ov19_021DA92C.s b/asm/ov19_021DA92C.s index f1922ae76f..2a272ee559 100644 --- a/asm/ov19_021DA92C.s +++ b/asm/ov19_021DA92C.s @@ -353,7 +353,7 @@ _021DAB7C: str r0, [r4, #0x3c] cmp r0, #0 bne _021DABDA - bl sub_02022974 + bl GF_AssertFail _021DABDA: ldr r0, [r4, #0x3c] mov r1, #0 @@ -439,7 +439,7 @@ _021DAC74: str r0, [r5, #0x4c] pop {r3, r4, r5, pc} _021DAC86: - bl sub_02022974 + bl GF_AssertFail _021DAC8A: pop {r3, r4, r5, pc} ; .align 2, 0 diff --git a/asm/ov19_021DB8E4.s b/asm/ov19_021DB8E4.s index 3c1efc7460..b66161e1bd 100644 --- a/asm/ov19_021DB8E4.s +++ b/asm/ov19_021DB8E4.s @@ -727,7 +727,7 @@ _021DBE34: str r0, [r4, #0x48] cmp r0, #0 bne _021DBE6E - bl sub_02022974 + bl GF_AssertFail _021DBE6E: ldr r0, [r4, #0x48] mov r1, #0 diff --git a/asm/ov19_021DC5F0.s b/asm/ov19_021DC5F0.s index 252b595d0a..8aa25b7b8d 100644 --- a/asm/ov19_021DC5F0.s +++ b/asm/ov19_021DC5F0.s @@ -991,7 +991,7 @@ ov19_021DCD18: ; 0x021DCD18 add r5, r0, #0 cmp r4, #6 blo _021DCD26 - bl sub_02022974 + bl GF_AssertFail _021DCD26: mov r0, #0x34 add r5, #0x3c diff --git a/asm/ov19_021DCF88.s b/asm/ov19_021DCF88.s index 3d7c4cdefd..981d0740a9 100644 --- a/asm/ov19_021DCF88.s +++ b/asm/ov19_021DCF88.s @@ -1238,7 +1238,7 @@ _021DD882: str r0, [r5, #0x54] cmp r0, #0 bne _021DD8D4 - bl sub_02022974 + bl GF_AssertFail _021DD8D4: sub r4, r4, #1 bpl _021DD8DA @@ -1455,7 +1455,7 @@ _021DDA18: str r0, [r4, #0x34] cmp r0, #0 bne _021DDA54 - bl sub_02022974 + bl GF_AssertFail _021DDA54: ldr r1, [sp, #0x14] add r0, r6, #0 @@ -1664,7 +1664,7 @@ ov19_021DDBD0: ; 0x021DDBD0 ldrb r0, [r4, r0] cmp r0, #0 bne _021DDBE2 - bl sub_02022974 + bl GF_AssertFail _021DDBE2: ldr r0, _021DDBF4 ; =0x000001CB ldrb r1, [r4, r0] @@ -1687,7 +1687,7 @@ ov19_021DDBF8: ; 0x021DDBF8 ldr r4, [sp, #0x20] cmp r7, #0 bne _021DDC0C - bl sub_02022974 + bl GF_AssertFail _021DDC0C: cmp r4, #0 beq _021DDC12 diff --git a/asm/ov19_021DF964.s b/asm/ov19_021DF964.s index ca2ba2d037..f582fc7ba0 100644 --- a/asm/ov19_021DF964.s +++ b/asm/ov19_021DF964.s @@ -321,7 +321,7 @@ _021DFBE6: strb r0, [r4] pop {r4, r5, r6, pc} _021DFBFE: - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} thumb_func_end ov19_021DFB94 diff --git a/asm/ov20_021D2098.s b/asm/ov20_021D2098.s index c02542d2c2..6b697d4f11 100644 --- a/asm/ov20_021D2098.s +++ b/asm/ov20_021D2098.s @@ -182,7 +182,7 @@ _021D21E4: blt _021D21C8 pop {r4, r5, r6, pc} _021D21EE: - bl sub_02022974 + bl GF_AssertFail _021D21F2: pop {r4, r5, r6, pc} ; .align 2, 0 diff --git a/asm/ov20_021D3A54.s b/asm/ov20_021D3A54.s index 24df994fa4..9e20a42475 100644 --- a/asm/ov20_021D3A54.s +++ b/asm/ov20_021D3A54.s @@ -201,7 +201,7 @@ _021D3BDA: ldr r0, _021D3C74 ; =0x000003EE cmp r6, r0 blo _021D3BE4 - bl sub_02022974 + bl GF_AssertFail _021D3BE4: ldr r0, [sp, #0x24] lsl r3, r7, #0x18 @@ -280,7 +280,7 @@ ov20_021D3C78: ; 0x021D3C78 str r2, [sp, #0x14] cmp r0, r1 blo _021D3C90 - bl sub_02022974 + bl GF_AssertFail _021D3C90: mov r0, #0xa str r0, [sp] @@ -396,7 +396,7 @@ _021D3D7C: lsl r0, r0, #4 cmp r5, r0 blo _021D3D88 - bl sub_02022974 + bl GF_AssertFail _021D3D88: ldrh r0, [r4, #2] add r1, r6, #0 diff --git a/asm/ov20_021D5044.s b/asm/ov20_021D5044.s index 7fa63e26a9..ee27a3a801 100644 --- a/asm/ov20_021D5044.s +++ b/asm/ov20_021D5044.s @@ -19,7 +19,7 @@ ov20_021D5048: ; 0x021D5048 add r5, r1, #0 cmp r4, #0x1b blo _021D5056 - bl sub_02022974 + bl GF_AssertFail _021D5056: mov r1, #0xa ldr r2, _021D5068 ; =0x021D5320 @@ -41,7 +41,7 @@ ov20_021D506C: ; 0x021D506C add r6, r2, #0 cmp r5, #0x1b blo _021D507C - bl sub_02022974 + bl GF_AssertFail _021D507C: mov r0, #0xa add r1, r5, #0 @@ -64,7 +64,7 @@ ov20_021D5098: ; 0x021D5098 add r4, r0, #0 cmp r4, #0x1b blo _021D50A4 - bl sub_02022974 + bl GF_AssertFail _021D50A4: mov r0, #0xa add r1, r4, #0 @@ -82,7 +82,7 @@ ov20_021D50B4: ; 0x021D50B4 add r4, r0, #0 cmp r4, #0x1b blo _021D50C0 - bl sub_02022974 + bl GF_AssertFail _021D50C0: mov r0, #0xa add r1, r4, #0 @@ -100,7 +100,7 @@ ov20_021D50D0: ; 0x021D50D0 add r4, r0, #0 cmp r4, #0x1b blo _021D50DC - bl sub_02022974 + bl GF_AssertFail _021D50DC: mov r0, #0xa add r1, r4, #0 @@ -118,7 +118,7 @@ ov20_021D50EC: ; 0x021D50EC add r4, r0, #0 cmp r4, #0x1b blo _021D50F8 - bl sub_02022974 + bl GF_AssertFail _021D50F8: mov r0, #0xa add r1, r4, #0 @@ -136,7 +136,7 @@ ov20_021D5108: ; 0x021D5108 add r4, r0, #0 cmp r4, #0x1b blo _021D5114 - bl sub_02022974 + bl GF_AssertFail _021D5114: mov r0, #0xa add r1, r4, #0 @@ -154,7 +154,7 @@ ov20_021D5124: ; 0x021D5124 add r4, r0, #0 cmp r4, #0x1b blo _021D5130 - bl sub_02022974 + bl GF_AssertFail _021D5130: mov r0, #0xa add r1, r4, #0 diff --git a/asm/ov21_021D0D80.s b/asm/ov21_021D0D80.s index ada67b20fa..c5f9d312e4 100644 --- a/asm/ov21_021D0D80.s +++ b/asm/ov21_021D0D80.s @@ -26,7 +26,7 @@ ov21_021D0D80: ; 0x021D0D80 bl sub_0200681C add r4, r0, #0 bne _021D0DAE - bl sub_02022974 + bl GF_AssertFail _021D0DAE: mov r0, #0 strb r0, [r4] @@ -53,7 +53,7 @@ _021D0DAE: bl sub_0201E450 cmp r0, #1 beq _021D0DF4 - bl sub_02022974 + bl GF_AssertFail _021D0DF4: mov r0, #0x25 bl ov21_021D12B0 @@ -170,7 +170,7 @@ ov21_021D0EC8: ; 0x021D0EC8 bl sub_0201E530 cmp r0, #1 beq _021D0EE4 - bl sub_02022974 + bl GF_AssertFail _021D0EE4: bl ov21_021D12C4 bl sub_0201DC3C @@ -254,7 +254,7 @@ ov21_021D0F60: ; 0x021D0F60 bl sub_02018144 add r4, r0, #0 bne _021D0F76 - bl sub_02022974 + bl GF_AssertFail _021D0F76: ldr r2, _021D1084 ; =0x00001D10 add r0, r4, #0 @@ -400,7 +400,7 @@ ov21_021D10B8: ; 0x021D10B8 push {r4, lr} add r4, r0, #0 bne _021D10C2 - bl sub_02022974 + bl GF_AssertFail _021D10C2: add r0, r4, #0 add r0, #0xc @@ -647,7 +647,7 @@ ov21_021D12EC: ; 0x021D12EC push {r4, lr} add r4, r0, #0 bne _021D12F6 - bl sub_02022974 + bl GF_AssertFail _021D12F6: mov r0, #0x1d lsl r0, r0, #8 @@ -661,7 +661,7 @@ ov21_021D1300: ; 0x021D1300 push {r4, lr} add r4, r0, #0 bne _021D130A - bl sub_02022974 + bl GF_AssertFail _021D130A: ldr r0, _021D1310 ; =0x00001D04 ldr r0, [r4, r0] @@ -675,7 +675,7 @@ ov21_021D1314: ; 0x021D1314 push {r4, lr} add r4, r0, #0 bne _021D131E - bl sub_02022974 + bl GF_AssertFail _021D131E: ldr r0, _021D1324 ; =0x00001D08 ldr r0, [r4, r0] @@ -689,7 +689,7 @@ ov21_021D1328: ; 0x021D1328 push {r4, lr} add r4, r0, #0 bne _021D1332 - bl sub_02022974 + bl GF_AssertFail _021D1332: ldr r0, _021D1338 ; =0x00001D0C ldr r0, [r4, r0] @@ -703,7 +703,7 @@ ov21_021D133C: ; 0x021D133C push {r4, lr} add r4, r0, #0 bne _021D1346 - bl sub_02022974 + bl GF_AssertFail _021D1346: ldr r0, _021D134C ; =0x00001A0C ldr r0, [r4, r0] @@ -717,7 +717,7 @@ ov21_021D1350: ; 0x021D1350 push {r4, lr} add r4, r0, #0 bne _021D135A - bl sub_02022974 + bl GF_AssertFail _021D135A: ldr r0, _021D1360 ; =0x00001A10 ldr r0, [r4, r0] @@ -731,7 +731,7 @@ ov21_021D1364: ; 0x021D1364 push {r4, lr} add r4, r0, #0 bne _021D136E - bl sub_02022974 + bl GF_AssertFail _021D136E: ldr r0, _021D1374 ; =0x00001A14 ldr r0, [r4, r0] @@ -745,7 +745,7 @@ ov21_021D1378: ; 0x021D1378 push {r4, lr} add r4, r0, #0 bne _021D1382 - bl sub_02022974 + bl GF_AssertFail _021D1382: ldr r0, _021D1388 ; =0x00001A18 ldr r0, [r4, r0] @@ -759,7 +759,7 @@ ov21_021D138C: ; 0x021D138C push {r4, lr} add r4, r0, #0 bne _021D1396 - bl sub_02022974 + bl GF_AssertFail _021D1396: ldr r0, _021D139C ; =0x000019FC add r0, r4, r0 @@ -773,7 +773,7 @@ ov21_021D13A0: ; 0x021D13A0 push {r4, lr} add r4, r0, #0 bne _021D13AA - bl sub_02022974 + bl GF_AssertFail _021D13AA: mov r0, #0x1a lsl r0, r0, #8 @@ -787,7 +787,7 @@ ov21_021D13B4: ; 0x021D13B4 push {r4, lr} add r4, r0, #0 bne _021D13BE - bl sub_02022974 + bl GF_AssertFail _021D13BE: ldr r0, _021D13C4 ; =0x00001A04 add r0, r4, r0 @@ -801,7 +801,7 @@ ov21_021D13C8: ; 0x021D13C8 push {r4, lr} add r4, r0, #0 bne _021D13D2 - bl sub_02022974 + bl GF_AssertFail _021D13D2: ldr r0, _021D13D8 ; =0x00001A08 add r0, r4, r0 @@ -815,7 +815,7 @@ ov21_021D13DC: ; 0x021D13DC push {r4, lr} add r4, r0, #0 bne _021D13E6 - bl sub_02022974 + bl GF_AssertFail _021D13E6: add r0, r4, #0 pop {r4, pc} @@ -827,7 +827,7 @@ ov21_021D13EC: ; 0x021D13EC push {r4, lr} add r4, r0, #0 bne _021D13F6 - bl sub_02022974 + bl GF_AssertFail _021D13F6: add r4, #0xc add r0, r4, #0 @@ -839,7 +839,7 @@ ov21_021D13FC: ; 0x021D13FC push {r4, lr} add r4, r0, #0 bne _021D1406 - bl sub_02022974 + bl GF_AssertFail _021D1406: ldr r0, _021D140C ; =0x0000177C add r0, r4, r0 @@ -855,7 +855,7 @@ ov21_021D1410: ; 0x021D1410 add r5, r0, #0 cmp r4, #0xa blt _021D141E - bl sub_02022974 + bl GF_AssertFail _021D141E: ldr r0, _021D142C ; =0x00001A30 add r1, r5, r0 @@ -874,7 +874,7 @@ ov21_021D1430: ; 0x021D1430 add r5, r0, #0 cmp r4, #8 blt _021D143E - bl sub_02022974 + bl GF_AssertFail _021D143E: mov r0, #0x6f lsl r0, r0, #6 @@ -1292,7 +1292,7 @@ ov21_021D172C: ; 0x021D172C beq _021D1758 cmp r4, #0 bgt _021D1758 - bl sub_02022974 + bl GF_AssertFail _021D1758: add r0, r6, #0 mov r1, #0xf @@ -2062,7 +2062,7 @@ ov21_021D1D08: ; 0x021D1D08 ldr r0, [r6, r0] cmp r0, #0 bne _021D1D20 - bl sub_02022974 + bl GF_AssertFail _021D1D20: ldr r0, _021D1E48 ; =0x00001A0C ldr r0, [r6, r0] @@ -2071,7 +2071,7 @@ _021D1D20: ldr r0, [r6, r0] cmp r0, #0 bne _021D1D34 - bl sub_02022974 + bl GF_AssertFail _021D1D34: ldr r0, _021D1E4C ; =0x00001A10 ldr r0, [r6, r0] @@ -2080,7 +2080,7 @@ _021D1D34: ldr r0, [r6, r0] cmp r0, #0 bne _021D1D48 - bl sub_02022974 + bl GF_AssertFail _021D1D48: ldr r0, _021D1E50 ; =0x00001A14 ldr r0, [r6, r0] @@ -2089,7 +2089,7 @@ _021D1D48: ldr r0, [r6, r0] cmp r0, #0 bne _021D1D5C - bl sub_02022974 + bl GF_AssertFail _021D1D5C: ldr r0, _021D1E54 ; =0x00001A18 ldr r0, [r6, r0] @@ -2099,7 +2099,7 @@ _021D1D5C: ldr r0, [r6, r0] cmp r0, #0 bne _021D1D72 - bl sub_02022974 + bl GF_AssertFail _021D1D72: mov r0, #0x1d lsl r0, r0, #8 @@ -2109,7 +2109,7 @@ _021D1D72: ldr r0, [r6, r0] cmp r0, #0 bne _021D1D88 - bl sub_02022974 + bl GF_AssertFail _021D1D88: ldr r0, _021D1E58 ; =0x00001D04 ldr r0, [r6, r0] @@ -2118,7 +2118,7 @@ _021D1D88: ldr r0, [r6, r0] cmp r0, #0 bne _021D1D9C - bl sub_02022974 + bl GF_AssertFail _021D1D9C: ldr r0, _021D1E5C ; =0x00001D08 ldr r0, [r6, r0] @@ -2127,7 +2127,7 @@ _021D1D9C: ldr r0, [r6, r0] cmp r0, #0 bne _021D1DB0 - bl sub_02022974 + bl GF_AssertFail _021D1DB0: ldr r0, _021D1E60 ; =0x00001D0C ldr r0, [r6, r0] diff --git a/asm/ov21_021D1FA4.s b/asm/ov21_021D1FA4.s index 6191e107ab..193556fd71 100644 --- a/asm/ov21_021D1FA4.s +++ b/asm/ov21_021D1FA4.s @@ -399,7 +399,7 @@ ov21_021D22A8: ; 0x021D22A8 ldr r0, [r4, r0] cmp r0, #0 bne _021D22BA - bl sub_02022974 + bl GF_AssertFail _021D22BA: mov r0, #0x6d lsl r0, r0, #2 @@ -417,7 +417,7 @@ ov21_021D22C4: ; 0x021D22C4 ldr r0, [r4, r0] cmp r0, #0 bne _021D22D6 - bl sub_02022974 + bl GF_AssertFail _021D22D6: mov r0, #0x6e lsl r0, r0, #2 @@ -489,7 +489,7 @@ ov21_021D2344: ; 0x021D2344 add r4, r0, #0 cmp r5, #3 ble _021D2352 - bl sub_02022974 + bl GF_AssertFail _021D2352: lsl r0, r5, #2 add r1, r4, r0 diff --git a/asm/ov21_021D3208.s b/asm/ov21_021D3208.s index 8f29a6d000..207258b839 100644 --- a/asm/ov21_021D3208.s +++ b/asm/ov21_021D3208.s @@ -67,7 +67,7 @@ _021D325E: bl ov21_021D3684 cmp r0, #0 bne _021D327C - bl sub_02022974 + bl GF_AssertFail _021D327C: ldr r1, [r4, #0x1c] add r0, r5, #0 @@ -177,7 +177,7 @@ ov21_021D335C: ; 0x021D335C add r5, r0, #0 cmp r4, #0x1c blt _021D336A - bl sub_02022974 + bl GF_AssertFail _021D336A: ldr r0, [r5, #0] add r1, r4, #0 @@ -192,7 +192,7 @@ ov21_021D3374: ; 0x021D3374 add r5, r0, #0 cmp r4, #2 blt _021D3382 - bl sub_02022974 + bl GF_AssertFail _021D3382: ldr r0, [r5, #0] add r1, r4, #0 @@ -207,7 +207,7 @@ ov21_021D338C: ; 0x021D338C add r5, r0, #0 cmp r4, #2 blt _021D339A - bl sub_02022974 + bl GF_AssertFail _021D339A: ldr r0, [r5, #0] add r1, r4, #0 @@ -222,7 +222,7 @@ ov21_021D33A4: ; 0x021D33A4 add r5, r0, #0 cmp r4, #3 blt _021D33B2 - bl sub_02022974 + bl GF_AssertFail _021D33B2: ldr r0, [r5, #0] add r1, r4, #0 @@ -237,7 +237,7 @@ ov21_021D33BC: ; 0x021D33BC add r5, r0, #0 cmp r4, #3 blt _021D33CA - bl sub_02022974 + bl GF_AssertFail _021D33CA: ldr r0, [r5, #0] add r1, r4, #0 @@ -367,7 +367,7 @@ ov21_021D3464: ; 0x021D3464 bl sub_02018184 add r6, r0, #0 bne _021D3482 - bl sub_02022974 + bl GF_AssertFail _021D3482: ldr r2, _021D367C ; =0x000003DA add r0, r6, #0 @@ -380,7 +380,7 @@ _021D3482: bl sub_02018184 add r4, r0, #0 bne _021D34A0 - bl sub_02022974 + bl GF_AssertFail _021D34A0: ldr r2, _021D367C ; =0x000003DA add r0, r4, #0 @@ -1379,7 +1379,7 @@ ov21_021D3B64: ; 0x021D3B64 add r4, r2, #0 cmp r5, #0x2f blt _021D3B76 - bl sub_02022974 + bl GF_AssertFail _021D3B76: bl sub_020989B8 mov r2, #0 @@ -1458,7 +1458,7 @@ _021D3BFA: add r6, r0, #0 b _021D3C0A _021D3C06: - bl sub_02022974 + bl GF_AssertFail _021D3C0A: cmp r6, #0 beq _021D3C32 @@ -1577,7 +1577,7 @@ _021D3CDE: add r4, r0, #0 b _021D3CEE _021D3CEA: - bl sub_02022974 + bl GF_AssertFail _021D3CEE: cmp r4, #0 beq _021D3D16 @@ -1752,7 +1752,7 @@ _021D3E32: add r4, r0, #0 b _021D3E42 _021D3E3E: - bl sub_02022974 + bl GF_AssertFail _021D3E42: cmp r4, #0 beq _021D3E6A @@ -1906,7 +1906,7 @@ _021D3F5C: add r4, r0, #0 b _021D3F6C _021D3F68: - bl sub_02022974 + bl GF_AssertFail _021D3F6C: cmp r4, #0 beq _021D3F94 diff --git a/asm/ov21_021D3FE0.s b/asm/ov21_021D3FE0.s index e566da94c6..9e321f3e40 100644 --- a/asm/ov21_021D3FE0.s +++ b/asm/ov21_021D3FE0.s @@ -14,7 +14,7 @@ ov21_021D3FE0: ; 0x021D3FE0 bl sub_02018144 add r4, r0, #0 bne _021D3FF2 - bl sub_02022974 + bl GF_AssertFail _021D3FF2: add r0, r4, #0 mov r1, #0 @@ -35,17 +35,17 @@ ov21_021D4008: ; 0x021D4008 add r4, r1, #0 cmp r5, #0 bne _021D4016 - bl sub_02022974 + bl GF_AssertFail _021D4016: cmp r4, #0 bne _021D401E - bl sub_02022974 + bl GF_AssertFail _021D401E: add r0, r5, #0 bl ov21_021D41A8 cmp r0, #0 bne _021D402C - bl sub_02022974 + bl GF_AssertFail _021D402C: ldr r0, [r4, #0] str r0, [r5, #0] @@ -90,7 +90,7 @@ ov21_021D4078: ; 0x021D4078 push {r4, lr} add r4, r0, #0 bne _021D4082 - bl sub_02022974 + bl GF_AssertFail _021D4082: ldr r0, [r4, #8] cmp r0, #5 @@ -153,7 +153,7 @@ _021D40F2: mov r0, #1 pop {r4, pc} _021D40F6: - bl sub_02022974 + bl GF_AssertFail _021D40FA: mov r0, #0 pop {r4, pc} @@ -166,7 +166,7 @@ ov21_021D4100: ; 0x021D4100 sub sp, #4 add r4, r0, #0 bne _021D410C - bl sub_02022974 + bl GF_AssertFail _021D410C: ldr r0, [r4, #8] cmp r0, #5 @@ -234,7 +234,7 @@ _021D4184: mov r0, #1 pop {r3, r4, pc} _021D418A: - bl sub_02022974 + bl GF_AssertFail _021D418E: mov r0, #0 add sp, #4 @@ -252,7 +252,7 @@ ov21_021D4198: ; 0x021D4198 push {r4, lr} add r4, r0, #0 bne _021D41A2 - bl sub_02022974 + bl GF_AssertFail _021D41A2: mov r0, #1 str r0, [r4, #0x18] @@ -264,7 +264,7 @@ ov21_021D41A8: ; 0x021D41A8 push {r4, lr} add r4, r0, #0 bne _021D41B2 - bl sub_02022974 + bl GF_AssertFail _021D41B2: ldr r0, [r4, #8] cmp r0, #5 @@ -281,7 +281,7 @@ ov21_021D41C0: ; 0x021D41C0 push {r4, lr} add r4, r0, #0 bne _021D41CA - bl sub_02022974 + bl GF_AssertFail _021D41CA: ldr r0, [r4, #8] cmp r0, #2 @@ -319,11 +319,11 @@ ov21_021D41EC: ; 0x021D41EC add r6, r2, #0 cmp r5, #0 bne _021D41FC - bl sub_02022974 + bl GF_AssertFail _021D41FC: cmp r4, #0 bne _021D4204 - bl sub_02022974 + bl GF_AssertFail _021D4204: add r0, r4, #0 add r1, r6, #0 @@ -340,16 +340,16 @@ ov21_021D420C: ; 0x021D420C add r7, r3, #0 cmp r5, #0 bne _021D421E - bl sub_02022974 + bl GF_AssertFail _021D421E: cmp r4, #0 bne _021D4226 - bl sub_02022974 + bl GF_AssertFail _021D4226: ldr r0, [sp, #0x18] cmp r0, #0 bne _021D4230 - bl sub_02022974 + bl GF_AssertFail _021D4230: ldr r3, [sp, #0x18] add r0, r6, #0 diff --git a/asm/ov21_021D423C.s b/asm/ov21_021D423C.s index 789ab55270..c54d535067 100644 --- a/asm/ov21_021D423C.s +++ b/asm/ov21_021D423C.s @@ -13,7 +13,7 @@ ov21_021D423C: ; 0x021D423C bl sub_02018144 add r4, r0, #0 bne _021D424C - bl sub_02022974 + bl GF_AssertFail _021D424C: mov r0, #0 strb r0, [r4] @@ -41,7 +41,7 @@ ov21_021D426C: ; 0x021D426C add r6, r2, #0 cmp r5, #0 bne _021D427C - bl sub_02022974 + bl GF_AssertFail _021D427C: str r4, [r5, #0] str r6, [r5, #4] @@ -56,7 +56,7 @@ ov21_021D4284: ; 0x021D4284 add r5, r1, #0 cmp r4, #0 bne _021D4292 - bl sub_02022974 + bl GF_AssertFail _021D4292: add r0, r4, #0 bl ov21_021D42EC @@ -95,7 +95,7 @@ ov21_021D42D4: ; 0x021D42D4 push {r4, lr} add r4, r0, #0 bne _021D42DE - bl sub_02022974 + bl GF_AssertFail _021D42DE: ldr r0, [r4, #8] cmp r0, #0 @@ -134,7 +134,7 @@ _021D430C: ldr r0, [r5, #0] cmp r0, #0 bne _021D4316 - bl sub_02022974 + bl GF_AssertFail _021D4316: ldr r0, [r5, #0] ldr r1, [r0, r4] diff --git a/asm/ov21_021D4340.s b/asm/ov21_021D4340.s index d1429dafed..362dff8d26 100644 --- a/asm/ov21_021D4340.s +++ b/asm/ov21_021D4340.s @@ -58,7 +58,7 @@ _021D4392: mov r0, #1 pop {r4, pc} _021D43A0: - bl sub_02022974 + bl GF_AssertFail _021D43A4: mov r0, #0 pop {r4, pc} @@ -128,7 +128,7 @@ _021D441E: add sp, #0x10 pop {r3, r4, r5, pc} _021D4428: - bl sub_02022974 + bl GF_AssertFail _021D442C: mov r0, #0 add sp, #0x10 @@ -280,7 +280,7 @@ _021D4542: mov r0, #1 pop {r3, r4, r5, pc} _021D454C: - bl sub_02022974 + bl GF_AssertFail _021D4550: mov r0, #0 add sp, #0x10 @@ -394,7 +394,7 @@ _021D4612: mov r0, #1 pop {r3, r4, r5, pc} _021D461C: - bl sub_02022974 + bl GF_AssertFail _021D4620: mov r0, #0 add sp, #8 @@ -440,7 +440,7 @@ ov21_021D4660: ; 0x021D4660 ldr r0, [r4, #0x10] cmp r0, #0 bne _021D466E - bl sub_02022974 + bl GF_AssertFail _021D466E: ldr r0, [r4, #0x10] bl sub_020181C4 @@ -462,7 +462,7 @@ ov21_021D467C: ; 0x021D467C bl sub_02018144 add r4, r0, #0 bne _021D4696 - bl sub_02022974 + bl GF_AssertFail _021D4696: add r0, r4, #0 mov r1, #0 @@ -521,7 +521,7 @@ ov21_021D4704: ; 0x021D4704 bl sub_02018144 add r4, r0, #0 bne _021D471E - bl sub_02022974 + bl GF_AssertFail _021D471E: add r2, r4, #0 mov r1, #0x14 @@ -564,7 +564,7 @@ ov21_021D475C: ; 0x021D475C bl sub_02018144 add r4, r0, #0 bne _021D4776 - bl sub_02022974 + bl GF_AssertFail _021D4776: add r0, r4, #0 mov r1, #0 @@ -628,7 +628,7 @@ ov21_021D47F0: ; 0x021D47F0 bl sub_02018144 add r4, r0, #0 bne _021D480A - bl sub_02022974 + bl GF_AssertFail _021D480A: add r0, r4, #0 mov r1, #0 @@ -688,7 +688,7 @@ ov21_021D4878: ; 0x021D4878 bl sub_02018144 add r4, r0, #0 bne _021D4894 - bl sub_02022974 + bl GF_AssertFail _021D4894: add r0, r6, #0 mov r1, #0 @@ -718,7 +718,7 @@ ov21_021D48B8: ; 0x021D48B8 bl sub_02018144 add r4, r0, #0 bne _021D48D2 - bl sub_02022974 + bl GF_AssertFail _021D48D2: add r2, r4, #0 mov r1, #0x18 @@ -766,7 +766,7 @@ ov21_021D491C: ; 0x021D491C bl sub_02018144 add r4, r0, #0 bne _021D4936 - bl sub_02022974 + bl GF_AssertFail _021D4936: add r2, r4, #0 mov r1, #0x18 @@ -814,7 +814,7 @@ ov21_021D4980: ; 0x021D4980 bl sub_02018144 add r4, r0, #0 bne _021D499A - bl sub_02022974 + bl GF_AssertFail _021D499A: add r2, r4, #0 mov r1, #0x18 @@ -862,7 +862,7 @@ ov21_021D49E4: ; 0x021D49E4 bl sub_02018144 add r4, r0, #0 bne _021D49FE - bl sub_02022974 + bl GF_AssertFail _021D49FE: mov r0, #0 strb r0, [r4] @@ -905,7 +905,7 @@ ov21_021D4A3C: ; 0x021D4A3C bl sub_02018144 add r4, r0, #0 bne _021D4A56 - bl sub_02022974 + bl GF_AssertFail _021D4A56: mov r0, #0 strb r0, [r4] @@ -948,7 +948,7 @@ ov21_021D4A94: ; 0x021D4A94 bl sub_02018144 add r4, r0, #0 bne _021D4AAE - bl sub_02022974 + bl GF_AssertFail _021D4AAE: add r2, r4, #0 mov r1, #0x18 @@ -996,7 +996,7 @@ ov21_021D4AF8: ; 0x021D4AF8 bl sub_02018144 add r4, r0, #0 bne _021D4B12 - bl sub_02022974 + bl GF_AssertFail _021D4B12: mov r0, #0 strb r0, [r4] @@ -1039,7 +1039,7 @@ ov21_021D4B50: ; 0x021D4B50 bl sub_02018144 add r4, r0, #0 bne _021D4B6A - bl sub_02022974 + bl GF_AssertFail _021D4B6A: add r2, r4, #0 mov r1, #0x18 @@ -1087,7 +1087,7 @@ ov21_021D4BB4: ; 0x021D4BB4 bl sub_02018144 add r4, r0, #0 bne _021D4BCE - bl sub_02022974 + bl GF_AssertFail _021D4BCE: mov r0, #0 strb r0, [r4] diff --git a/asm/ov21_021D4C0C.s b/asm/ov21_021D4C0C.s index 235ce2c900..738184b2bc 100644 --- a/asm/ov21_021D4C0C.s +++ b/asm/ov21_021D4C0C.s @@ -15,7 +15,7 @@ ov21_021D4C0C: ; 0x021D4C0C bl sub_02018144 add r4, r0, #0 bne _021D4C20 - bl sub_02022974 + bl GF_AssertFail _021D4C20: add r2, r4, #0 mov r1, #0x18 @@ -36,7 +36,7 @@ _021D4C26: str r0, [r4, #0xc] cmp r0, #0 bne _021D4C4C - bl sub_02022974 + bl GF_AssertFail _021D4C4C: ldr r2, [r5, #8] ldr r0, [r4, #0xc] @@ -60,7 +60,7 @@ ov21_021D4C6C: ; 0x021D4C6C push {r4, lr} add r4, r0, #0 bne _021D4C76 - bl sub_02022974 + bl GF_AssertFail _021D4C76: add r0, r4, #0 bl ov21_021D4D3C @@ -106,7 +106,7 @@ ov21_021D4CB8: ; 0x021D4CB8 bl ov21_021D4EB4 add r4, r0, #0 bne _021D4CCE - bl sub_02022974 + bl GF_AssertFail _021D4CCE: ldr r2, [r5, #0x20] add r0, r6, #0 @@ -244,7 +244,7 @@ ov21_021D4DAC: ; 0x021D4DAC bl sub_0200B144 add r5, r0, #0 bne _021D4DC8 - bl sub_02022974 + bl GF_AssertFail _021D4DC8: add r0, r5, #0 add r1, r4, #0 @@ -292,7 +292,7 @@ ov21_021D4E10: ; 0x021D4E10 bl sub_0200B144 add r4, r0, #0 bne _021D4E2C - bl sub_02022974 + bl GF_AssertFail _021D4E2C: add r0, r4, #0 add r1, r6, #0 diff --git a/asm/ov21_021D4EE4.s b/asm/ov21_021D4EE4.s index 519905c809..683e7ce4a3 100644 --- a/asm/ov21_021D4EE4.s +++ b/asm/ov21_021D4EE4.s @@ -83,7 +83,7 @@ _021D4F50: cmp r4, r0 blt _021D4F5E _021D4F5A: - bl sub_02022974 + bl GF_AssertFail _021D4F5E: str r4, [r5, #0xc] pop {r3, r4, r5, pc} @@ -94,7 +94,7 @@ _021D4F62: cmp r4, r0 blt _021D4F70 _021D4F6C: - bl sub_02022974 + bl GF_AssertFail _021D4F70: str r4, [r5, #0x10] pop {r3, r4, r5, pc} @@ -239,7 +239,7 @@ ov21_021D5040: ; 0x021D5040 beq _021D5056 cmp r4, #1 beq _021D5056 - bl sub_02022974 + bl GF_AssertFail _021D5056: ldr r0, [r5, #0xc] mov r1, #0x1c @@ -286,7 +286,7 @@ ov21_021D5090: ; 0x021D5090 beq _021D50A6 cmp r4, #1 beq _021D50A6 - bl sub_02022974 + bl GF_AssertFail _021D50A6: ldr r0, [r5, #0x10] mov r1, #0x1c diff --git a/asm/ov21_021D517C.s b/asm/ov21_021D517C.s index d7bde5a66e..23576fe885 100644 --- a/asm/ov21_021D517C.s +++ b/asm/ov21_021D517C.s @@ -678,7 +678,7 @@ _021D55F4: mov r4, #0x2f b _021D55FC _021D55F8: - bl sub_02022974 + bl GF_AssertFail _021D55FC: add r0, r4, #0 pop {r4, pc} diff --git a/asm/ov21_021D5600.s b/asm/ov21_021D5600.s index 214ac330c5..b64afc64f8 100644 --- a/asm/ov21_021D5600.s +++ b/asm/ov21_021D5600.s @@ -126,7 +126,7 @@ ov21_021D56BC: ; 0x021D56BC bne _021D56E8 cmp r4, #1 blt _021D56E0 - bl sub_02022974 + bl GF_AssertFail _021D56E0: add r0, r5, r4 str r0, [sp, #4] @@ -143,7 +143,7 @@ _021D56E8: stmia r2!, {r0, r1} cmp r4, #1 blt _021D5700 - bl sub_02022974 + bl GF_AssertFail _021D5700: ldr r0, [sp, #4] lsl r1, r0, #2 @@ -209,13 +209,13 @@ ov21_021D5764: ; 0x021D5764 str r0, [r5, #0] cmp r0, #6 blt _021D577E - bl sub_02022974 + bl GF_AssertFail _021D577E: str r7, [r4, #0] ldr r5, [r5, #0] cmp r5, #6 blt _021D578A - bl sub_02022974 + bl GF_AssertFail _021D578A: cmp r5, #1 bne _021D5790 @@ -235,7 +235,7 @@ _021D57A2: _021D57A4: cmp r0, #0 bne _021D57AC - bl sub_02022974 + bl GF_AssertFail _021D57AC: pop {r3, r4, r5, r6, r7, pc} nop diff --git a/asm/ov21_021D57B4.s b/asm/ov21_021D57B4.s index 0af9788929..2cc1c11dff 100644 --- a/asm/ov21_021D57B4.s +++ b/asm/ov21_021D57B4.s @@ -90,12 +90,12 @@ ov21_021D5844: ; 0x021D5844 push {r4, lr} add r4, r0, #0 bne _021D584E - bl sub_02022974 + bl GF_AssertFail _021D584E: ldr r0, [r4, #0] cmp r0, #0 bne _021D5858 - bl sub_02022974 + bl GF_AssertFail _021D5858: ldr r0, [r4, #0] bl sub_020181C4 @@ -169,7 +169,7 @@ ov21_021D58C0: ; 0x021D58C0 add r0, r1, r0 cmp r0, r2 blt _021D58D8 - bl sub_02022974 + bl GF_AssertFail _021D58D8: ldrb r1, [r4] ldrb r0, [r4, #2] @@ -177,7 +177,7 @@ _021D58D8: ldr r0, [sp, #4] cmp r1, r0 blt _021D58E8 - bl sub_02022974 + bl GF_AssertFail _021D58E8: ldrb r7, [r4, #1] ldrb r0, [r4, #3] @@ -264,7 +264,7 @@ _021D5976: ldr r0, [r0, r7] cmp r0, #0 bne _021D5984 - bl sub_02022974 + bl GF_AssertFail _021D5984: mov r1, #0 cmp r4, #0 @@ -392,13 +392,13 @@ _021D5A64: ldr r0, [r0, r6] cmp r0, #0 bne _021D5A70 - bl sub_02022974 + bl GF_AssertFail _021D5A70: ldr r1, [sp, #0x10] ldr r0, [sp, #0x14] cmp r1, r0 blt _021D5A7C - bl sub_02022974 + bl GF_AssertFail _021D5A7C: mov r1, #0 cmp r4, #0 diff --git a/asm/ov21_021D5AEC.s b/asm/ov21_021D5AEC.s index e31a8a5980..cd554d0292 100644 --- a/asm/ov21_021D5AEC.s +++ b/asm/ov21_021D5AEC.s @@ -97,7 +97,7 @@ ov21_021D5B90: ; 0x021D5B90 bl sub_02018144 add r4, r0, #0 bne _021D5BA2 - bl sub_02022974 + bl GF_AssertFail _021D5BA2: add r0, r4, #0 mov r1, #0 @@ -124,7 +124,7 @@ ov21_021D5BCC: ; 0x021D5BCC push {r4, lr} add r4, r0, #0 bne _021D5BD6 - bl sub_02022974 + bl GF_AssertFail _021D5BD6: add r0, r4, #0 bl sub_020181C4 @@ -140,7 +140,7 @@ ov21_021D5BE0: ; 0x021D5BE0 bl sub_02018144 add r4, r0, #0 bne _021D5BF2 - bl sub_02022974 + bl GF_AssertFail _021D5BF2: mov r0, #0 strb r0, [r4] @@ -159,7 +159,7 @@ ov21_021D5C08: ; 0x021D5C08 push {r4, lr} add r4, r0, #0 bne _021D5C12 - bl sub_02022974 + bl GF_AssertFail _021D5C12: add r0, r4, #0 bl sub_020181C4 @@ -217,7 +217,7 @@ ov21_021D5C7C: ; 0x021D5C7C push {r4, lr} add r4, r0, #0 bne _021D5C86 - bl sub_02022974 + bl GF_AssertFail _021D5C86: add r0, r4, #0 bl ov21_021D4660 @@ -255,7 +255,7 @@ ov21_021D5CB8: ; 0x021D5CB8 str r0, [r5, #8] cmp r0, #0 bne _021D5CD0 - bl sub_02022974 + bl GF_AssertFail _021D5CD0: ldr r0, [r5, #8] mov r1, #0 @@ -353,7 +353,7 @@ _021D5D6C: bl sub_02018144 add r7, r0, #0 bne _021D5D7E - bl sub_02022974 + bl GF_AssertFail _021D5D7E: str r7, [r4, #8] add r0, r7, #0 @@ -437,7 +437,7 @@ _021D5E0C: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021D5E20: - bl sub_02022974 + bl GF_AssertFail _021D5E24: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -588,7 +588,7 @@ _021D5F46: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021D5F4A: - bl sub_02022974 + bl GF_AssertFail _021D5F4E: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -2401,7 +2401,7 @@ ov21_021D6D78: ; 0x021D6D78 str r0, [sp] cmp r0, #0 bne _021D6D96 - bl sub_02022974 + bl GF_AssertFail _021D6D96: mov r0, #0x15 lsl r0, r0, #4 diff --git a/asm/ov21_021D76B0.s b/asm/ov21_021D76B0.s index 576680c63e..5a71d99f79 100644 --- a/asm/ov21_021D76B0.s +++ b/asm/ov21_021D76B0.s @@ -71,7 +71,7 @@ ov21_021D7728: ; 0x021D7728 bl sub_02018144 add r4, r0, #0 bne _021D773C - bl sub_02022974 + bl GF_AssertFail _021D773C: add r0, r4, #0 mov r1, #0 @@ -107,7 +107,7 @@ ov21_021D7770: ; 0x021D7770 bl sub_02018144 add r4, r0, #0 bne _021D7782 - bl sub_02022974 + bl GF_AssertFail _021D7782: mov r0, #0 strb r0, [r4] @@ -135,7 +135,7 @@ ov21_021D7798: ; 0x021D7798 bl sub_02018144 add r4, r0, #0 bne _021D77B8 - bl sub_02022974 + bl GF_AssertFail _021D77B8: add r0, r4, #0 mov r1, #0 @@ -156,7 +156,7 @@ ov21_021D77D4: ; 0x021D77D4 push {r4, lr} add r4, r0, #0 bne _021D77DE - bl sub_02022974 + bl GF_AssertFail _021D77DE: add r0, r4, #0 bl sub_020181C4 @@ -169,7 +169,7 @@ ov21_021D77E8: ; 0x021D77E8 push {r4, lr} add r4, r0, #0 bne _021D77F2 - bl sub_02022974 + bl GF_AssertFail _021D77F2: add r0, r4, #0 bl sub_020181C4 @@ -182,7 +182,7 @@ ov21_021D77FC: ; 0x021D77FC push {r4, lr} add r4, r0, #0 bne _021D7806 - bl sub_02022974 + bl GF_AssertFail _021D7806: add r0, r4, #0 bl ov21_021D4660 @@ -208,7 +208,7 @@ ov21_021D7818: ; 0x021D7818 str r0, [r5, #8] cmp r0, #0 bne _021D7830 - bl sub_02022974 + bl GF_AssertFail _021D7830: ldr r0, [r5, #8] mov r1, #0 @@ -318,7 +318,7 @@ _021D78E4: str r0, [r4, #8] cmp r0, #0 bne _021D78F6 - bl sub_02022974 + bl GF_AssertFail _021D78F6: ldr r0, [r4, #8] mov r1, #0 @@ -1231,7 +1231,7 @@ ov21_021D8018: ; 0x021D8018 ldr r4, [r1, #0] cmp r0, #0 bne _021D802E - bl sub_02022974 + bl GF_AssertFail _021D802E: mov r0, #0x51 lsl r0, r0, #2 diff --git a/asm/ov21_021D85B0.s b/asm/ov21_021D85B0.s index 9be8964673..4f7ff65551 100644 --- a/asm/ov21_021D85B0.s +++ b/asm/ov21_021D85B0.s @@ -69,7 +69,7 @@ ov21_021D8628: ; 0x021D8628 ldr r4, [r0, #0] cmp r5, #4 blt _021D8636 - bl sub_02022974 + bl GF_AssertFail _021D8636: str r5, [r4, #0xc] pop {r3, r4, r5, pc} @@ -91,7 +91,7 @@ ov21_021D8644: ; 0x021D8644 ldr r4, [r0, #0] cmp r5, #6 blt _021D8652 - bl sub_02022974 + bl GF_AssertFail _021D8652: str r5, [r4, #0x10] pop {r3, r4, r5, pc} @@ -113,7 +113,7 @@ ov21_021D8660: ; 0x021D8660 ldr r4, [r0, #0] cmp r5, #0xa blt _021D866E - bl sub_02022974 + bl GF_AssertFail _021D866E: str r5, [r4, #0x14] pop {r3, r4, r5, pc} @@ -136,7 +136,7 @@ ov21_021D867C: ; 0x021D867C ldr r4, [r0, #0] cmp r5, #0x12 blt _021D868C - bl sub_02022974 + bl GF_AssertFail _021D868C: cmp r6, #0 bne _021D8694 @@ -167,7 +167,7 @@ ov21_021D86A8: ; 0x021D86A8 ldr r4, [r0, #0] cmp r5, #0xf blt _021D86B6 - bl sub_02022974 + bl GF_AssertFail _021D86B6: str r5, [r4, #0x20] pop {r3, r4, r5, pc} @@ -224,7 +224,7 @@ ov21_021D86E8: ; 0x021D86E8 bl sub_02018144 add r4, r0, #0 bne _021D86FA - bl sub_02022974 + bl GF_AssertFail _021D86FA: add r0, r4, #0 mov r1, #0 @@ -253,7 +253,7 @@ ov21_021D8724: ; 0x021D8724 bl sub_02018144 add r4, r0, #0 bne _021D8736 - bl sub_02022974 + bl GF_AssertFail _021D8736: mov r0, #0 strb r0, [r4] @@ -281,7 +281,7 @@ ov21_021D874C: ; 0x021D874C bl sub_02018144 add r4, r0, #0 bne _021D876C - bl sub_02022974 + bl GF_AssertFail _021D876C: add r0, r4, #0 mov r1, #0 @@ -302,7 +302,7 @@ ov21_021D8788: ; 0x021D8788 push {r4, lr} add r4, r0, #0 bne _021D8792 - bl sub_02022974 + bl GF_AssertFail _021D8792: add r0, r4, #0 bl sub_020181C4 @@ -315,7 +315,7 @@ ov21_021D879C: ; 0x021D879C push {r4, lr} add r4, r0, #0 bne _021D87A6 - bl sub_02022974 + bl GF_AssertFail _021D87A6: add r0, r4, #0 bl sub_020181C4 @@ -328,7 +328,7 @@ ov21_021D87B0: ; 0x021D87B0 push {r4, lr} add r4, r0, #0 bne _021D87BA - bl sub_02022974 + bl GF_AssertFail _021D87BA: add r0, r4, #0 bl ov21_021D4660 @@ -353,7 +353,7 @@ ov21_021D87CC: ; 0x021D87CC bl sub_02018144 add r6, r0, #0 bne _021D87E2 - bl sub_02022974 + bl GF_AssertFail _021D87E2: mov r0, #0 strb r0, [r6] @@ -523,7 +523,7 @@ _021D8908: str r0, [r5, #0] b _021D891E _021D891A: - bl sub_02022974 + bl GF_AssertFail _021D891E: mov r0, #0 add sp, #0x14 diff --git a/asm/ov21_021D94BC.s b/asm/ov21_021D94BC.s index 71908214fb..ba1611fe3f 100644 --- a/asm/ov21_021D94BC.s +++ b/asm/ov21_021D94BC.s @@ -70,7 +70,7 @@ ov21_021D9534: ; 0x021D9534 bl sub_02018144 add r4, r0, #0 bne _021D9546 - bl sub_02022974 + bl GF_AssertFail _021D9546: add r2, r4, #0 mov r1, #0x10 @@ -106,7 +106,7 @@ ov21_021D957C: ; 0x021D957C bl sub_02018144 add r4, r0, #0 bne _021D958E - bl sub_02022974 + bl GF_AssertFail _021D958E: mov r0, #0 strb r0, [r4] @@ -139,7 +139,7 @@ ov21_021D95B8: ; 0x021D95B8 push {r4, lr} add r4, r0, #0 bne _021D95C2 - bl sub_02022974 + bl GF_AssertFail _021D95C2: add r0, r4, #0 bl sub_020181C4 @@ -152,7 +152,7 @@ ov21_021D95CC: ; 0x021D95CC push {r4, lr} add r4, r0, #0 bne _021D95D6 - bl sub_02022974 + bl GF_AssertFail _021D95D6: add r0, r4, #0 bl sub_020181C4 @@ -182,7 +182,7 @@ ov21_021D95E8: ; 0x021D95E8 bl sub_02018144 add r4, r0, #0 bne _021D95FE - bl sub_02022974 + bl GF_AssertFail _021D95FE: add r0, r4, #0 mov r1, #0 @@ -4468,7 +4468,7 @@ _021DB452: mov r4, #4 b _021DB45A _021DB456: - bl sub_02022974 + bl GF_AssertFail _021DB45A: ldr r0, [r5, #0x18] mov r1, #4 diff --git a/asm/ov21_021DC9BC.s b/asm/ov21_021DC9BC.s index 2383b07580..1667d86bb9 100644 --- a/asm/ov21_021DC9BC.s +++ b/asm/ov21_021DC9BC.s @@ -73,7 +73,7 @@ ov21_021DCA30: ; 0x021DCA30 ldr r4, [r0, #0] cmp r5, #3 blt _021DCA3E - bl sub_02022974 + bl GF_AssertFail _021DCA3E: str r5, [r4, #4] pop {r3, r4, r5, pc} @@ -112,7 +112,7 @@ ov21_021DCA5C: ; 0x021DCA5C bl sub_02018144 add r4, r0, #0 bne _021DCA6E - bl sub_02022974 + bl GF_AssertFail _021DCA6E: mov r0, #0 strb r0, [r4] @@ -147,7 +147,7 @@ ov21_021DCAA0: ; 0x021DCAA0 bl sub_02018144 add r4, r0, #0 bne _021DCAB2 - bl sub_02022974 + bl GF_AssertFail _021DCAB2: add r2, r4, #0 mov r1, #0x14 @@ -169,7 +169,7 @@ ov21_021DCACC: ; 0x021DCACC push {r4, lr} add r4, r0, #0 bne _021DCAD6 - bl sub_02022974 + bl GF_AssertFail _021DCAD6: add r0, r4, #0 bl sub_020181C4 @@ -182,7 +182,7 @@ ov21_021DCAE0: ; 0x021DCAE0 push {r4, lr} add r4, r0, #0 bne _021DCAEA - bl sub_02022974 + bl GF_AssertFail _021DCAEA: add r0, r4, #0 bl sub_020181C4 @@ -206,7 +206,7 @@ ov21_021DCAF8: ; 0x021DCAF8 bl sub_02018144 add r4, r0, #0 bne _021DCB0E - bl sub_02022974 + bl GF_AssertFail _021DCB0E: add r0, r4, #0 mov r1, #0 @@ -1195,7 +1195,7 @@ ov21_021DD2E0: ; 0x021DD2E0 ldr r7, [r4, #0] cmp r0, #0 bne _021DD2F8 - bl sub_02022974 + bl GF_AssertFail _021DD2F8: mov r0, #0x51 ldr r1, [r4, #0] @@ -2248,7 +2248,7 @@ _021DDAF2: str r0, [sp] b _021DDB00 _021DDAFC: - bl sub_02022974 + bl GF_AssertFail _021DDB00: add r0, r5, #0 ldr r2, [sp, #4] diff --git a/asm/ov21_021DDD2C.s b/asm/ov21_021DDD2C.s index 168ba6874c..b04128ca4e 100644 --- a/asm/ov21_021DDD2C.s +++ b/asm/ov21_021DDD2C.s @@ -70,7 +70,7 @@ ov21_021DDDA4: ; 0x021DDDA4 bl sub_02018144 add r4, r0, #0 bne _021DDDB6 - bl sub_02022974 + bl GF_AssertFail _021DDDB6: mov r0, #0 strb r0, [r4] @@ -108,7 +108,7 @@ ov21_021DDDF0: ; 0x021DDDF0 bl sub_02018144 add r4, r0, #0 bne _021DDE02 - bl sub_02022974 + bl GF_AssertFail _021DDE02: mov r0, #0 strb r0, [r4] @@ -133,7 +133,7 @@ ov21_021DDE1C: ; 0x021DDE1C push {r4, lr} add r4, r0, #0 bne _021DDE26 - bl sub_02022974 + bl GF_AssertFail _021DDE26: add r0, r4, #0 bl sub_020181C4 @@ -146,7 +146,7 @@ ov21_021DDE30: ; 0x021DDE30 push {r4, lr} add r4, r0, #0 bne _021DDE3A - bl sub_02022974 + bl GF_AssertFail _021DDE3A: add r0, r4, #0 bl sub_020181C4 @@ -176,7 +176,7 @@ ov21_021DDE4C: ; 0x021DDE4C bl sub_02018144 add r4, r0, #0 bne _021DDE62 - bl sub_02022974 + bl GF_AssertFail _021DDE62: add r0, r4, #0 mov r1, #0 @@ -1154,7 +1154,7 @@ _021DE588: bl sub_0201DC68 cmp r0, #0 bne _021DE5A2 - bl sub_02022974 + bl GF_AssertFail _021DE5A2: pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov21_021DE4D4 diff --git a/asm/ov21_021DE668.s b/asm/ov21_021DE668.s index af784ae8b3..c813129ddb 100644 --- a/asm/ov21_021DE668.s +++ b/asm/ov21_021DE668.s @@ -85,7 +85,7 @@ ov21_021DE6E8: ; 0x021DE6E8 bl sub_02018144 add r4, r0, #0 bne _021DE6FA - bl sub_02022974 + bl GF_AssertFail _021DE6FA: add r0, r4, #0 mov r1, #0 @@ -114,7 +114,7 @@ ov21_021DE724: ; 0x021DE724 bl sub_02018144 add r4, r0, #0 bne _021DE736 - bl sub_02022974 + bl GF_AssertFail _021DE736: mov r0, #0 strb r0, [r4] @@ -133,7 +133,7 @@ ov21_021DE74C: ; 0x021DE74C push {r4, lr} add r4, r0, #0 bne _021DE756 - bl sub_02022974 + bl GF_AssertFail _021DE756: add r0, r4, #0 bl sub_020181C4 @@ -146,7 +146,7 @@ ov21_021DE760: ; 0x021DE760 push {r4, lr} add r4, r0, #0 bne _021DE76A - bl sub_02022974 + bl GF_AssertFail _021DE76A: add r0, r4, #0 bl sub_020181C4 diff --git a/asm/ov21_021DF734.s b/asm/ov21_021DF734.s index 2000e2497c..3028bd43f3 100644 --- a/asm/ov21_021DF734.s +++ b/asm/ov21_021DF734.s @@ -93,7 +93,7 @@ ov21_021DF7CC: ; 0x021DF7CC bl sub_02018144 add r4, r0, #0 bne _021DF7DE - bl sub_02022974 + bl GF_AssertFail _021DF7DE: add r2, r4, #0 mov r1, #0x18 @@ -126,7 +126,7 @@ ov21_021DF80C: ; 0x021DF80C bl sub_02018144 add r4, r0, #0 bne _021DF81E - bl sub_02022974 + bl GF_AssertFail _021DF81E: mov r0, #0 strb r0, [r4] @@ -153,7 +153,7 @@ ov21_021DF844: ; 0x021DF844 push {r4, lr} add r4, r0, #0 bne _021DF84E - bl sub_02022974 + bl GF_AssertFail _021DF84E: add r0, r4, #0 bl sub_020181C4 @@ -166,7 +166,7 @@ ov21_021DF858: ; 0x021DF858 push {r4, lr} add r4, r0, #0 bne _021DF862 - bl sub_02022974 + bl GF_AssertFail _021DF862: add r0, r4, #0 bl sub_020181C4 @@ -402,7 +402,7 @@ _021DF9D8: str r0, [r4, #0] b _021DFA08 _021DFA04: - bl sub_02022974 + bl GF_AssertFail _021DFA08: add r0, r6, #0 bl ov21_021E0C30 @@ -666,7 +666,7 @@ ov21_021DFBEC: ; 0x021DFBEC ldr r4, [sp, #0x2c] cmp r5, #2 ble _021DFC04 - bl sub_02022974 + bl GF_AssertFail _021DFC04: ldr r0, [sp, #0x28] cmp r0, #0xc @@ -792,7 +792,7 @@ _021DFCE4: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} _021DFCF8: - bl sub_02022974 + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov21_021DFBEC @@ -1639,7 +1639,7 @@ _021E0314: mvn r0, r0 cmp r4, r0 bne _021E0338 - bl sub_02022974 + bl GF_AssertFail _021E0338: cmp r4, #0 bne _021E0340 @@ -1701,7 +1701,7 @@ _021E0380: mvn r1, r1 cmp r0, r1 bne _021E03A6 - bl sub_02022974 + bl GF_AssertFail _021E03A6: add r0, r4, #1 add r1, sp, #0x18 @@ -1732,7 +1732,7 @@ _021E03C0: mvn r1, r1 cmp r0, r1 bne _021E03E6 - bl sub_02022974 + bl GF_AssertFail _021E03E6: add sp, #0x1c pop {r4, r5, r6, r7, pc} @@ -1777,7 +1777,7 @@ _021E0416: mvn r1, r1 cmp r0, r1 bne _021E0438 - bl sub_02022974 + bl GF_AssertFail _021E0438: add r0, r4, #1 add r1, sp, #0x10 @@ -1806,7 +1806,7 @@ _021E0452: mvn r1, r1 cmp r0, r1 bne _021E0474 - bl sub_02022974 + bl GF_AssertFail _021E0474: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -1850,7 +1850,7 @@ _021E04A2: mvn r1, r1 cmp r0, r1 bne _021E04C4 - bl sub_02022974 + bl GF_AssertFail _021E04C4: add r0, r4, #1 add r1, sp, #0x10 @@ -1879,7 +1879,7 @@ _021E04DE: mvn r1, r1 cmp r0, r1 bne _021E0500 - bl sub_02022974 + bl GF_AssertFail _021E0500: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -1923,7 +1923,7 @@ _021E052E: mvn r1, r1 cmp r0, r1 bne _021E0550 - bl sub_02022974 + bl GF_AssertFail _021E0550: add r0, r4, #1 add r1, sp, #0x10 @@ -1952,7 +1952,7 @@ _021E056A: mvn r1, r1 cmp r0, r1 bne _021E058C - bl sub_02022974 + bl GF_AssertFail _021E058C: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -1996,7 +1996,7 @@ _021E05BA: mvn r1, r1 cmp r0, r1 bne _021E05DC - bl sub_02022974 + bl GF_AssertFail _021E05DC: add r0, r4, #1 add r1, sp, #0x10 @@ -2025,7 +2025,7 @@ _021E05F6: mvn r1, r1 cmp r0, r1 bne _021E0618 - bl sub_02022974 + bl GF_AssertFail _021E0618: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -2069,7 +2069,7 @@ _021E0646: mvn r1, r1 cmp r0, r1 bne _021E0668 - bl sub_02022974 + bl GF_AssertFail _021E0668: add r0, r4, #1 add r1, sp, #0x10 @@ -2098,7 +2098,7 @@ _021E0682: mvn r1, r1 cmp r0, r1 bne _021E06A4 - bl sub_02022974 + bl GF_AssertFail _021E06A4: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -2140,7 +2140,7 @@ _021E06D2: bl ov21_021D1B94 cmp r0, #0xf bne _021E06F0 - bl sub_02022974 + bl GF_AssertFail _021E06F0: add r0, r4, #1 add r1, sp, #0x10 @@ -2167,7 +2167,7 @@ _021E070A: bl ov21_021D1B94 cmp r0, #0xf bne _021E0728 - bl sub_02022974 + bl GF_AssertFail _021E0728: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -2211,7 +2211,7 @@ _021E0756: mvn r1, r1 cmp r0, r1 bne _021E0778 - bl sub_02022974 + bl GF_AssertFail _021E0778: add r0, r4, #1 add r1, sp, #0x10 @@ -2240,7 +2240,7 @@ _021E0792: mvn r1, r1 cmp r0, r1 bne _021E07B4 - bl sub_02022974 + bl GF_AssertFail _021E07B4: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -2284,7 +2284,7 @@ _021E07E2: mvn r1, r1 cmp r0, r1 bne _021E0804 - bl sub_02022974 + bl GF_AssertFail _021E0804: add r0, r4, #1 add r1, sp, #0x10 @@ -2313,7 +2313,7 @@ _021E081E: mvn r1, r1 cmp r0, r1 bne _021E0840 - bl sub_02022974 + bl GF_AssertFail _021E0840: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -2357,7 +2357,7 @@ _021E086E: mvn r1, r1 cmp r0, r1 bne _021E0890 - bl sub_02022974 + bl GF_AssertFail _021E0890: add r0, r4, #1 add r1, sp, #0x10 @@ -2386,7 +2386,7 @@ _021E08AA: mvn r1, r1 cmp r0, r1 bne _021E08CC - bl sub_02022974 + bl GF_AssertFail _021E08CC: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -2517,7 +2517,7 @@ ov21_021E09A4: ; 0x021E09A4 ldr r4, [r6, #0] cmp r0, #0 bne _021E09C0 - bl sub_02022974 + bl GF_AssertFail _021E09C0: ldr r1, [sp] ldr r2, [sp, #0x50] @@ -2599,7 +2599,7 @@ ov21_021E0A4C: ; 0x021E0A4C mvn r0, r0 cmp r5, r0 bne _021E0A70 - bl sub_02022974 + bl GF_AssertFail _021E0A70: cmp r5, #0 beq _021E0A7A @@ -2613,7 +2613,7 @@ _021E0A7E: mov r4, #0xe b _021E0A86 _021E0A82: - bl sub_02022974 + bl GF_AssertFail _021E0A86: add r0, r4, #0 pop {r4, r5, r6, pc} @@ -2769,7 +2769,7 @@ _021E0B50: mov r5, #0x58 b _021E0B5E _021E0B5A: - bl sub_02022974 + bl GF_AssertFail _021E0B5E: str r4, [r6, #0] str r5, [r7, #0] diff --git a/asm/ov21_021E0C68.s b/asm/ov21_021E0C68.s index 0902844dab..33fb526f33 100644 --- a/asm/ov21_021E0C68.s +++ b/asm/ov21_021E0C68.s @@ -111,7 +111,7 @@ ov21_021E0D04: ; 0x021E0D04 bl sub_02018144 add r4, r0, #0 bne _021E0D16 - bl sub_02022974 + bl GF_AssertFail _021E0D16: add r0, r4, #0 mov r1, #0 @@ -140,7 +140,7 @@ ov21_021E0D40: ; 0x021E0D40 bl sub_02018144 add r4, r0, #0 bne _021E0D52 - bl sub_02022974 + bl GF_AssertFail _021E0D52: mov r0, #0 strb r0, [r4] @@ -159,7 +159,7 @@ ov21_021E0D68: ; 0x021E0D68 push {r4, lr} add r4, r0, #0 bne _021E0D72 - bl sub_02022974 + bl GF_AssertFail _021E0D72: add r0, r4, #0 bl sub_020181C4 @@ -172,7 +172,7 @@ ov21_021E0D7C: ; 0x021E0D7C push {r4, lr} add r4, r0, #0 bne _021E0D86 - bl sub_02022974 + bl GF_AssertFail _021E0D86: add r0, r4, #0 bl sub_020181C4 @@ -649,7 +649,7 @@ ov21_021E10D0: ; 0x021E10D0 cmp r0, #2 beq _021E110A mov r7, #0 - bl sub_02022974 + bl GF_AssertFail _021E110A: ldr r0, [r4, #0x18] bl ov21_021E185C @@ -1645,7 +1645,7 @@ _021E1892: mov r4, #0x1a b _021E189A _021E1896: - bl sub_02022974 + bl GF_AssertFail _021E189A: add r0, r4, #0 pop {r4, pc} diff --git a/asm/ov21_021E1924.s b/asm/ov21_021E1924.s index 87ccc0a824..6c34725e6a 100644 --- a/asm/ov21_021E1924.s +++ b/asm/ov21_021E1924.s @@ -70,7 +70,7 @@ ov21_021E199C: ; 0x021E199C bl sub_02018144 add r4, r0, #0 bne _021E19AE - bl sub_02022974 + bl GF_AssertFail _021E19AE: add r2, r4, #0 mov r1, #0x18 @@ -116,7 +116,7 @@ ov21_021E19FC: ; 0x021E19FC bl sub_02018144 add r4, r0, #0 bne _021E1A0E - bl sub_02022974 + bl GF_AssertFail _021E1A0E: mov r0, #0 strb r0, [r4] @@ -144,7 +144,7 @@ ov21_021E1A24: ; 0x021E1A24 bl sub_02018144 add r4, r0, #0 bne _021E1A44 - bl sub_02022974 + bl GF_AssertFail _021E1A44: add r0, r4, #0 mov r1, #0 @@ -177,7 +177,7 @@ ov21_021E1A7C: ; 0x021E1A7C push {r4, lr} add r4, r0, #0 bne _021E1A86 - bl sub_02022974 + bl GF_AssertFail _021E1A86: add r0, r4, #0 bl sub_020181C4 @@ -190,7 +190,7 @@ ov21_021E1A90: ; 0x021E1A90 push {r4, lr} add r4, r0, #0 bne _021E1A9A - bl sub_02022974 + bl GF_AssertFail _021E1A9A: add r0, r4, #0 bl sub_020181C4 @@ -203,7 +203,7 @@ ov21_021E1AA4: ; 0x021E1AA4 push {r4, lr} add r4, r0, #0 bne _021E1AAE - bl sub_02022974 + bl GF_AssertFail _021E1AAE: add r0, r4, #0 bl ov21_021D4660 @@ -1472,7 +1472,7 @@ ov21_021E2478: ; 0x021E2478 ldr r4, [r1, #0] cmp r0, #0 bne _021E248C - bl sub_02022974 + bl GF_AssertFail _021E248C: mov r0, #0x51 lsl r0, r0, #2 @@ -1832,7 +1832,7 @@ _021E2720: bl sub_0201DC68 cmp r0, #0 bne _021E2748 - bl sub_02022974 + bl GF_AssertFail _021E2748: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -2179,7 +2179,7 @@ ov21_021E29A4: ; 0x021E29A4 cmp r4, #8 blt _021E29B8 _021E29B4: - bl sub_02022974 + bl GF_AssertFail _021E29B8: sub r0, r4, #2 lsl r1, r0, #2 diff --git a/asm/ov21_021E29DC.s b/asm/ov21_021E29DC.s index c4becf0942..e013b61bd3 100644 --- a/asm/ov21_021E29DC.s +++ b/asm/ov21_021E29DC.s @@ -78,7 +78,7 @@ ov21_021E2A5C: ; 0x021E2A5C bl sub_02018144 add r4, r0, #0 bne _021E2A6E - bl sub_02022974 + bl GF_AssertFail _021E2A6E: add r0, r4, #0 mov r1, #0 @@ -137,7 +137,7 @@ ov21_021E2AE0: ; 0x021E2AE0 bl sub_02018144 add r4, r0, #0 bne _021E2AF2 - bl sub_02022974 + bl GF_AssertFail _021E2AF2: mov r0, #0 strb r0, [r4] @@ -165,7 +165,7 @@ ov21_021E2B08: ; 0x021E2B08 bl sub_02018144 add r4, r0, #0 bne _021E2B28 - bl sub_02022974 + bl GF_AssertFail _021E2B28: add r0, r4, #0 mov r1, #0 @@ -229,7 +229,7 @@ ov21_021E2BA8: ; 0x021E2BA8 push {r4, lr} add r4, r0, #0 bne _021E2BB2 - bl sub_02022974 + bl GF_AssertFail _021E2BB2: add r0, r4, #0 bl sub_020181C4 @@ -242,7 +242,7 @@ ov21_021E2BBC: ; 0x021E2BBC push {r4, lr} add r4, r0, #0 bne _021E2BC6 - bl sub_02022974 + bl GF_AssertFail _021E2BC6: add r0, r4, #0 bl sub_020181C4 @@ -255,7 +255,7 @@ ov21_021E2BD0: ; 0x021E2BD0 push {r4, lr} add r4, r0, #0 bne _021E2BDA - bl sub_02022974 + bl GF_AssertFail _021E2BDA: add r0, r4, #0 bl ov21_021D4660 @@ -419,7 +419,7 @@ _021E2CFA: mov r0, #1 pop {r4, r5, r6, r7, pc} _021E2D06: - bl sub_02022974 + bl GF_AssertFail _021E2D0A: mov r0, #0 add sp, #0x14 @@ -548,7 +548,7 @@ _021E2DEE: mov r0, #1 pop {r4, r5, pc} _021E2DF4: - bl sub_02022974 + bl GF_AssertFail _021E2DF8: mov r0, #0 add sp, #0x14 @@ -797,7 +797,7 @@ _021E2FBC: str r0, [sp, #4] b _021E2FC6 _021E2FC2: - bl sub_02022974 + bl GF_AssertFail _021E2FC6: ldr r0, [sp] cmp r0, #4 @@ -884,7 +884,7 @@ _021E306A: bl ov21_021E4068 b _021E307A _021E3076: - bl sub_02022974 + bl GF_AssertFail _021E307A: ldr r0, [sp, #4] add sp, #8 @@ -1330,7 +1330,7 @@ ov21_021E33C4: ; 0x021E33C4 bl sub_02018144 add r4, r0, #0 bne _021E33D6 - bl sub_02022974 + bl GF_AssertFail _021E33D6: add r0, r4, #0 mov r1, #0 @@ -1359,7 +1359,7 @@ ov21_021E3400: ; 0x021E3400 bl sub_02018144 add r4, r0, #0 bne _021E3412 - bl sub_02022974 + bl GF_AssertFail _021E3412: mov r0, #0 strb r0, [r4] @@ -1384,7 +1384,7 @@ ov21_021E342C: ; 0x021E342C push {r4, lr} add r4, r0, #0 bne _021E3436 - bl sub_02022974 + bl GF_AssertFail _021E3436: add r0, r4, #0 bl sub_020181C4 @@ -1397,7 +1397,7 @@ ov21_021E3440: ; 0x021E3440 push {r4, lr} add r4, r0, #0 bne _021E344A - bl sub_02022974 + bl GF_AssertFail _021E344A: add r0, r4, #0 bl sub_020181C4 @@ -1873,7 +1873,7 @@ _021E37A2: str r0, [r4, #0x1c] pop {r4, pc} _021E37AE: - bl sub_02022974 + bl GF_AssertFail _021E37B2: pop {r4, pc} thumb_func_end ov21_021E3734 diff --git a/asm/ov21_021E3FFC.s b/asm/ov21_021E3FFC.s index 054da4e8fd..239337600f 100644 --- a/asm/ov21_021E3FFC.s +++ b/asm/ov21_021E3FFC.s @@ -90,7 +90,7 @@ ov21_021E4080: ; 0x021E4080 bl sub_02018144 add r4, r0, #0 bne _021E4092 - bl sub_02022974 + bl GF_AssertFail _021E4092: add r2, r4, #0 mov r1, #0x10 @@ -126,7 +126,7 @@ ov21_021E40C8: ; 0x021E40C8 bl sub_02018144 add r4, r0, #0 bne _021E40DA - bl sub_02022974 + bl GF_AssertFail _021E40DA: add r2, r4, #0 mov r1, #0x14 @@ -148,7 +148,7 @@ ov21_021E40F4: ; 0x021E40F4 push {r4, lr} add r4, r0, #0 bne _021E40FE - bl sub_02022974 + bl GF_AssertFail _021E40FE: add r0, r4, #0 bl sub_020181C4 @@ -161,7 +161,7 @@ ov21_021E4108: ; 0x021E4108 push {r4, lr} add r4, r0, #0 bne _021E4112 - bl sub_02022974 + bl GF_AssertFail _021E4112: add r0, r4, #0 bl sub_020181C4 @@ -188,7 +188,7 @@ ov21_021E4120: ; 0x021E4120 bl sub_02018144 add r4, r0, #0 bne _021E413E - bl sub_02022974 + bl GF_AssertFail _021E413E: add r2, r4, #0 mov r1, #0x18 diff --git a/asm/ov21_021E4CA4.s b/asm/ov21_021E4CA4.s index cf9a8289b7..da8b8e315f 100644 --- a/asm/ov21_021E4CA4.s +++ b/asm/ov21_021E4CA4.s @@ -78,7 +78,7 @@ ov21_021E4D24: ; 0x021E4D24 bl sub_02018144 add r4, r0, #0 bne _021E4D36 - bl sub_02022974 + bl GF_AssertFail _021E4D36: add r2, r4, #0 mov r1, #0x10 @@ -111,7 +111,7 @@ ov21_021E4D64: ; 0x021E4D64 bl sub_02018144 add r4, r0, #0 bne _021E4D76 - bl sub_02022974 + bl GF_AssertFail _021E4D76: mov r0, #0 strb r0, [r4] @@ -136,7 +136,7 @@ ov21_021E4D90: ; 0x021E4D90 push {r4, lr} add r4, r0, #0 bne _021E4D9A - bl sub_02022974 + bl GF_AssertFail _021E4D9A: add r0, r4, #0 bl sub_020181C4 @@ -149,7 +149,7 @@ ov21_021E4DA4: ; 0x021E4DA4 push {r4, lr} add r4, r0, #0 bne _021E4DAE - bl sub_02022974 + bl GF_AssertFail _021E4DAE: add r0, r4, #0 bl sub_020181C4 diff --git a/asm/ov21_021E6014.s b/asm/ov21_021E6014.s index 3ce0688ec7..6da7e36d92 100644 --- a/asm/ov21_021E6014.s +++ b/asm/ov21_021E6014.s @@ -70,7 +70,7 @@ ov21_021E608C: ; 0x021E608C bl sub_02018144 add r4, r0, #0 bne _021E609E - bl sub_02022974 + bl GF_AssertFail _021E609E: mov r0, #0 strb r0, [r4] @@ -108,7 +108,7 @@ ov21_021E60D8: ; 0x021E60D8 bl sub_02018144 add r4, r0, #0 bne _021E60EA - bl sub_02022974 + bl GF_AssertFail _021E60EA: mov r0, #0 strb r0, [r4] @@ -133,7 +133,7 @@ ov21_021E6104: ; 0x021E6104 push {r4, lr} add r4, r0, #0 bne _021E610E - bl sub_02022974 + bl GF_AssertFail _021E610E: add r0, r4, #0 bl sub_020181C4 @@ -146,7 +146,7 @@ ov21_021E6118: ; 0x021E6118 push {r4, lr} add r4, r0, #0 bne _021E6122 - bl sub_02022974 + bl GF_AssertFail _021E6122: add r0, r4, #0 bl sub_020181C4 @@ -175,7 +175,7 @@ ov21_021E6134: ; 0x021E6134 bl sub_02018144 add r4, r0, #0 bne _021E6148 - bl sub_02022974 + bl GF_AssertFail _021E6148: mov r0, #0 strb r0, [r4] diff --git a/asm/ov21_021E68F4.s b/asm/ov21_021E68F4.s index db49fee617..4215d7fc4d 100644 --- a/asm/ov21_021E68F4.s +++ b/asm/ov21_021E68F4.s @@ -70,7 +70,7 @@ ov21_021E696C: ; 0x021E696C bl sub_02018144 add r4, r0, #0 bne _021E697E - bl sub_02022974 + bl GF_AssertFail _021E697E: add r2, r4, #0 mov r1, #0x10 @@ -105,7 +105,7 @@ ov21_021E69B0: ; 0x021E69B0 bl sub_02018144 add r4, r0, #0 bne _021E69C2 - bl sub_02022974 + bl GF_AssertFail _021E69C2: mov r0, #0 strb r0, [r4] @@ -133,7 +133,7 @@ ov21_021E69D8: ; 0x021E69D8 bl sub_02018144 add r4, r0, #0 bne _021E69F8 - bl sub_02022974 + bl GF_AssertFail _021E69F8: add r0, r4, #0 mov r1, #0 @@ -159,7 +159,7 @@ ov21_021E6A20: ; 0x021E6A20 push {r4, lr} add r4, r0, #0 bne _021E6A2A - bl sub_02022974 + bl GF_AssertFail _021E6A2A: add r0, r4, #0 bl sub_020181C4 @@ -172,7 +172,7 @@ ov21_021E6A34: ; 0x021E6A34 push {r4, lr} add r4, r0, #0 bne _021E6A3E - bl sub_02022974 + bl GF_AssertFail _021E6A3E: add r0, r4, #0 bl sub_020181C4 @@ -185,7 +185,7 @@ ov21_021E6A48: ; 0x021E6A48 push {r4, lr} add r4, r0, #0 bne _021E6A52 - bl sub_02022974 + bl GF_AssertFail _021E6A52: add r0, r4, #0 bl ov21_021D4660 @@ -1078,7 +1078,7 @@ ov21_021E70D4: ; 0x021E70D4 ldr r4, [r1, #0] cmp r0, #0 bne _021E70E8 - bl sub_02022974 + bl GF_AssertFail _021E70E8: mov r0, #0x51 lsl r0, r0, #2 @@ -1272,7 +1272,7 @@ _021E7250: bl sub_0201DC68 cmp r0, #0 bne _021E7278 - bl sub_02022974 + bl GF_AssertFail _021E7278: add sp, #0x14 pop {r4, r5, r6, r7, pc} diff --git a/asm/ov21_021E737C.s b/asm/ov21_021E737C.s index 0537c7ae06..1537fd5058 100644 --- a/asm/ov21_021E737C.s +++ b/asm/ov21_021E737C.s @@ -66,7 +66,7 @@ ov21_021E73E8: ; 0x021E73E8 bl sub_02018144 add r4, r0, #0 bne _021E73FA - bl sub_02022974 + bl GF_AssertFail _021E73FA: mov r0, #0 strb r0, [r4] @@ -98,7 +98,7 @@ ov21_021E7424: ; 0x021E7424 bl sub_02018144 add r4, r0, #0 bne _021E7438 - bl sub_02022974 + bl GF_AssertFail _021E7438: add r0, r4, #0 mov r1, #0 @@ -126,7 +126,7 @@ ov21_021E7468: ; 0x021E7468 push {r4, lr} add r4, r0, #0 bne _021E7472 - bl sub_02022974 + bl GF_AssertFail _021E7472: add r0, r4, #0 bl sub_020181C4 @@ -139,7 +139,7 @@ ov21_021E747C: ; 0x021E747C push {r4, lr} add r4, r0, #0 bne _021E7486 - bl sub_02022974 + bl GF_AssertFail _021E7486: add r0, r4, #0 bl ov21_021E7F20 @@ -167,7 +167,7 @@ ov21_021E74A0: ; 0x021E74A0 bl sub_02018144 add r4, r0, #0 bne _021E74B6 - bl sub_02022974 + bl GF_AssertFail _021E74B6: mov r0, #0 strb r0, [r4] @@ -826,7 +826,7 @@ ov21_021E7904: ; 0x021E7904 bl sub_0200A640 cmp r0, #0 bne _021E79AC - bl sub_02022974 + bl GF_AssertFail _021E79AC: add r0, r4, #0 mov r1, #0x60 diff --git a/asm/ov21_021E8484.s b/asm/ov21_021E8484.s index a2893c9e44..f7d4fe033d 100644 --- a/asm/ov21_021E8484.s +++ b/asm/ov21_021E8484.s @@ -70,7 +70,7 @@ ov21_021E84FC: ; 0x021E84FC bl sub_02018144 add r4, r0, #0 bne _021E850E - bl sub_02022974 + bl GF_AssertFail _021E850E: add r2, r4, #0 mov r1, #0x10 @@ -106,7 +106,7 @@ ov21_021E8544: ; 0x021E8544 bl sub_02018144 add r4, r0, #0 bne _021E8556 - bl sub_02022974 + bl GF_AssertFail _021E8556: mov r0, #0 strb r0, [r4] @@ -131,7 +131,7 @@ ov21_021E8570: ; 0x021E8570 push {r4, lr} add r4, r0, #0 bne _021E857A - bl sub_02022974 + bl GF_AssertFail _021E857A: add r0, r4, #0 bl sub_020181C4 @@ -144,7 +144,7 @@ ov21_021E8584: ; 0x021E8584 push {r4, lr} add r4, r0, #0 bne _021E858E - bl sub_02022974 + bl GF_AssertFail _021E858E: add r0, r4, #0 bl sub_020181C4 @@ -935,7 +935,7 @@ ov21_021E8B40: ; 0x021E8B40 ldr r4, [r1, #0] cmp r0, #0 bne _021E8B54 - bl sub_02022974 + bl GF_AssertFail _021E8B54: mov r0, #0x51 lsl r0, r0, #2 @@ -1091,7 +1091,7 @@ _021E8C68: bl sub_0201DC68 cmp r0, #0 bne _021E8C90 - bl sub_02022974 + bl GF_AssertFail _021E8C90: add sp, #0x14 pop {r4, r5, r6, r7, pc} diff --git a/asm/ov21_021E8D48.s b/asm/ov21_021E8D48.s index 15affab696..dde5aa0e8d 100644 --- a/asm/ov21_021E8D48.s +++ b/asm/ov21_021E8D48.s @@ -950,7 +950,7 @@ ov21_021E94B0: ; 0x021E94B0 str r0, [r5, #0] cmp r0, #0 bne _021E94F2 - bl sub_02022974 + bl GF_AssertFail _021E94F2: add sp, #0x44 pop {r3, r4, r5, r6, pc} @@ -997,7 +997,7 @@ ov21_021E9504: ; 0x021E9504 str r0, [r5, #0] cmp r0, #0 bne _021E9546 - bl sub_02022974 + bl GF_AssertFail _021E9546: ldr r0, [r5, #0] mov r1, #0x11 @@ -1425,7 +1425,7 @@ _021E9874: bl sub_020059D0 cmp r0, #0 bne _021E9896 - bl sub_02022974 + bl GF_AssertFail _021E9896: mov r0, #0x6e lsl r0, r0, #2 diff --git a/asm/ov22_02254DE0.s b/asm/ov22_02254DE0.s index 1f554b5163..f5647106c9 100644 --- a/asm/ov22_02254DE0.s +++ b/asm/ov22_02254DE0.s @@ -49,7 +49,7 @@ ov22_02254E20: ; 0x02254E20 bl ov22_02254FE0 add r4, r0, #0 bne _02254E32 - bl sub_02022974 + bl GF_AssertFail _02254E32: ldr r0, [r5, #0x18] str r0, [r4, #0] diff --git a/asm/ov22_02255094.s b/asm/ov22_02255094.s index 1e9533395e..86d63280c6 100644 --- a/asm/ov22_02255094.s +++ b/asm/ov22_02255094.s @@ -976,7 +976,7 @@ _022557BA: ldr r0, [r5, #8] cmp r1, r0 blt _022557C6 - bl sub_02022974 + bl GF_AssertFail _022557C6: ldr r0, [r4, #4] cmp r0, #0 @@ -1031,7 +1031,7 @@ _0225581A: ldr r0, [r5, #0x14] cmp r1, r0 blt _02255826 - bl sub_02022974 + bl GF_AssertFail _02255826: ldr r0, [r4, #4] cmp r0, #0 @@ -1377,7 +1377,7 @@ _02255AD8: str r0, [sp, #4] cmp r0, #0 bne _02255AF6 - bl sub_02022974 + bl GF_AssertFail _02255AF6: ldr r1, [sp, #4] add r0, r6, #0 @@ -1484,7 +1484,7 @@ _02255B5E: ldr r0, [r0, #4] cmp r0, #0 bne _02255BD4 - bl sub_02022974 + bl GF_AssertFail _02255BD4: ldr r1, [r5, #0] ldr r0, [r4, #8] diff --git a/asm/ov22_02255D44.s b/asm/ov22_02255D44.s index e6d943ff87..3943bd4395 100644 --- a/asm/ov22_02255D44.s +++ b/asm/ov22_02255D44.s @@ -479,7 +479,7 @@ _022560E0: bl sub_0201E530 cmp r0, #1 beq _02256152 - bl sub_02022974 + bl GF_AssertFail _02256152: add r0, r6, #0 bl sub_02006830 @@ -1094,7 +1094,7 @@ ov22_02256600: ; 0x02256600 bl sub_0201E530 cmp r0, #1 beq _02256698 - bl sub_02022974 + bl GF_AssertFail _02256698: add r0, r5, #0 bl sub_02006830 @@ -1911,7 +1911,7 @@ _02256C9E: bl ov22_02258218 cmp r0, #0 bne _02256CB6 - bl sub_02022974 + bl GF_AssertFail _02256CB6: ldr r0, [r4, #0xc] add sp, #4 @@ -2208,7 +2208,7 @@ _02256EEC: bl ov22_02258218 cmp r0, #0 bne _02256F04 - bl sub_02022974 + bl GF_AssertFail _02256F04: ldr r0, [r4, #0xc] add sp, #4 @@ -2818,7 +2818,7 @@ ov22_022573EC: ; 0x022573EC ldr r0, [r5, r0] cmp r0, #0 beq _02257400 - bl sub_02022974 + bl GF_AssertFail _02257400: ldr r0, _0225748C ; =0x000006B4 mov r1, #0xf @@ -3064,7 +3064,7 @@ _022575A6: mov r4, #0x14 b _022575AE _022575AA: - bl sub_02022974 + bl GF_AssertFail _022575AE: add r0, r4, #0 pop {r4, pc} @@ -3171,7 +3171,7 @@ ov22_02257658: ; 0x02257658 add r6, r2, #0 cmp r4, #0 bne _02257668 - bl sub_02022974 + bl GF_AssertFail _02257668: add r0, r5, #0 add r0, #0xa8 @@ -3256,7 +3256,7 @@ ov22_022576E8: ; 0x022576E8 add r4, r0, #0 cmp r5, #0x15 blo _022576F6 - bl sub_02022974 + bl GF_AssertFail _022576F6: lsl r0, r5, #3 ldr r0, [r4, r0] @@ -3270,7 +3270,7 @@ ov22_022576FC: ; 0x022576FC add r4, r0, #0 cmp r5, #0x15 blo _0225770A - bl sub_02022974 + bl GF_AssertFail _0225770A: lsl r0, r5, #3 add r0, r4, r0 diff --git a/asm/ov22_022578F4.s b/asm/ov22_022578F4.s index 41f9c1188a..b88d2cd14c 100644 --- a/asm/ov22_022578F4.s +++ b/asm/ov22_022578F4.s @@ -239,7 +239,7 @@ ov22_02257A80: ; 0x02257A80 sub r0, r0, #1 str r0, [r4, #0x24] bpl _02257A96 - bl sub_02022974 + bl GF_AssertFail _02257A96: pop {r4, pc} thumb_func_end ov22_02257A80 diff --git a/asm/ov22_02257F50.s b/asm/ov22_02257F50.s index 1642fc747c..ee8c5703ed 100644 --- a/asm/ov22_02257F50.s +++ b/asm/ov22_02257F50.s @@ -243,7 +243,7 @@ _022580E6: str r1, [sp, #0x44] b _022580F8 _022580F4: - bl sub_02022974 + bl GF_AssertFail _022580F8: ldr r0, [sp, #0xc] ldr r1, [r5, #0x48] @@ -256,12 +256,12 @@ _022580F8: ldr r1, [r2, r1] str r1, [sp, #0x34] bne _02258112 - bl sub_02022974 + bl GF_AssertFail _02258112: ldr r0, [sp, #0x34] cmp r0, #0 bne _0225811C - bl sub_02022974 + bl GF_AssertFail _0225811C: ldr r2, [r5, #4] add r0, r6, #0 @@ -691,7 +691,7 @@ ov22_02258414: ; 0x02258414 push {r4, lr} add r4, r0, #0 bne _0225841E - bl sub_02022974 + bl GF_AssertFail _0225841E: ldr r0, [r4, #0] pop {r4, pc} @@ -706,7 +706,7 @@ ov22_02258424: ; 0x02258424 add r4, r1, #0 cmp r5, #0 bne _02258434 - bl sub_02022974 + bl GF_AssertFail _02258434: mov r0, #0xc mul r0, r4 @@ -1068,7 +1068,7 @@ ov22_0225864C: ; 0x0225864C str r0, [r4, #0x28] cmp r0, #0 bne _022586AC - bl sub_02022974 + bl GF_AssertFail _022586AC: ldr r3, [r4, #0x2c] mov r2, #0xc @@ -1258,7 +1258,7 @@ _022587E8: add sp, #4 pop {r3, r4, r5, r6, pc} _0225881C: - bl sub_02022974 + bl GF_AssertFail _02258820: ldr r0, [r4, #0x28] ldr r1, [r4, #0x2c] diff --git a/asm/ov22_0225894C.s b/asm/ov22_0225894C.s index 1250af8a10..55661d4189 100644 --- a/asm/ov22_0225894C.s +++ b/asm/ov22_0225894C.s @@ -59,7 +59,7 @@ ov22_0225899C: ; 0x0225899C add r4, r0, #0 cmp r5, #0x64 blo _022589AA - bl sub_02022974 + bl GF_AssertFail _022589AA: lsl r0, r5, #2 ldr r0, [r4, r0] diff --git a/asm/ov22_022589E0.s b/asm/ov22_022589E0.s index fa766c3e06..d86a7105a4 100644 --- a/asm/ov22_022589E0.s +++ b/asm/ov22_022589E0.s @@ -213,7 +213,7 @@ ov22_02258B78: ; 0x02258B78 ldr r0, [r0, #4] cmp r0, #1 beq _02258B8E - bl sub_02022974 + bl GF_AssertFail _02258B8E: ldr r0, [r4, #0x10] mov r2, #0x1c @@ -574,7 +574,7 @@ ov22_02258E5C: ; 0x02258E5C ldr r0, [r0, #4] cmp r0, #1 beq _02258E70 - bl sub_02022974 + bl GF_AssertFail _02258E70: ldr r0, [r4, #0x10] ldr r5, [r0, #0] diff --git a/asm/ov22_02259484.s b/asm/ov22_02259484.s index f6f2d87259..c64a274e99 100644 --- a/asm/ov22_02259484.s +++ b/asm/ov22_02259484.s @@ -18,7 +18,7 @@ ov22_02259484: ; 0x02259484 str r0, [r5, #0] cmp r0, #0 bne _0225949E - bl sub_02022974 + bl GF_AssertFail _0225949E: ldr r0, [r5, #0] mov r1, #0 @@ -50,12 +50,12 @@ ov22_022594C0: ; 0x022594C0 add r7, r2, #0 cmp r0, #0 bne _022594D2 - bl sub_02022974 + bl GF_AssertFail _022594D2: ldr r0, [r5, #4] cmp r0, #0 bne _022594DC - bl sub_02022974 + bl GF_AssertFail _022594DC: ldr r2, [r5, #4] mov r4, #0 @@ -73,7 +73,7 @@ _022594E6: _022594F4: cmp r2, r4 bgt _022594FC - bl sub_02022974 + bl GF_AssertFail _022594FC: ldr r0, [r5, #0] lsl r1, r4, #4 diff --git a/asm/ov22_02259C58.s b/asm/ov22_02259C58.s index 94e2cd037a..a89d8fb662 100644 --- a/asm/ov22_02259C58.s +++ b/asm/ov22_02259C58.s @@ -13,18 +13,18 @@ ov22_02259C58: ; 0x02259C58 add r4, r1, #0 cmp r5, #0 bne _02259C66 - bl sub_02022974 + bl GF_AssertFail _02259C66: cmp r4, #0 bne _02259C6E - bl sub_02022974 + bl GF_AssertFail _02259C6E: ldr r0, [r4, #0] bl sub_02021AA0 str r0, [r5, #0] cmp r0, #0 bne _02259C7E - bl sub_02022974 + bl GF_AssertFail _02259C7E: ldr r0, [r4, #0xc] str r0, [r5, #4] @@ -177,7 +177,7 @@ ov22_02259D78: ; 0x02259D78 add r7, r3, #0 cmp r5, #0 bne _02259D8A - bl sub_02022974 + bl GF_AssertFail _02259D8A: str r7, [r5, #4] str r6, [r5, #8] @@ -439,7 +439,7 @@ ov22_02259F88: ; 0x02259F88 ldr r0, [r4, #0x68] cmp r0, #0 bne _02259F96 - bl sub_02022974 + bl GF_AssertFail _02259F96: ldr r0, [r4, #0x68] bl sub_0202404C @@ -502,7 +502,7 @@ ov22_02259FF4: ; 0x02259FF4 add r7, r3, #0 cmp r5, #0 bne _0225A006 - bl sub_02022974 + bl GF_AssertFail _0225A006: cmp r4, #4 bge _0225A01A @@ -604,7 +604,7 @@ _0225A0A2: bl ov22_02259D1C pop {r4, r5, r6, pc} _0225A0D4: - bl sub_02022974 + bl GF_AssertFail _0225A0D8: pop {r4, r5, r6, pc} nop @@ -743,7 +743,7 @@ ov22_0225A154: ; 0x0225A154 bl sub_0201ED94 cmp r0, #0 bne _0225A1F0 - bl sub_02022974 + bl GF_AssertFail _0225A1F0: ldr r0, [r5, #0x18] add r1, sp, #0x80 @@ -946,7 +946,7 @@ ov22_0225A348: ; 0x0225A348 bl sub_0200B144 add r7, r0, #0 bne _0225A360 - bl sub_02022974 + bl GF_AssertFail _0225A360: add r0, r7, #0 add r1, r4, #0 diff --git a/asm/ov22_0225A428.s b/asm/ov22_0225A428.s index 71bc630dc2..29c8593578 100644 --- a/asm/ov22_0225A428.s +++ b/asm/ov22_0225A428.s @@ -279,7 +279,7 @@ ov22_0225A628: ; 0x0225A628 add r7, r3, #0 tst r0, r1 bne _0225A644 - bl sub_02022974 + bl GF_AssertFail _0225A644: mov r0, #0 str r0, [sp] @@ -310,7 +310,7 @@ ov22_0225A660: ; 0x0225A660 add r7, r3, #0 tst r0, r1 bne _0225A67C - bl sub_02022974 + bl GF_AssertFail _0225A67C: mov r0, #0 str r0, [sp] @@ -593,7 +593,7 @@ ov22_0225A860: ; 0x0225A860 bl sub_0200B144 add r5, r0, #0 bne _0225A878 - bl sub_02022974 + bl GF_AssertFail _0225A878: add r0, r5, #0 add r1, r4, #0 @@ -635,7 +635,7 @@ ov22_0225A8B4: ; 0x0225A8B4 str r3, [sp, #0x10] cmp r0, #0 beq _0225A8CC - bl sub_02022974 + bl GF_AssertFail _0225A8CC: mov r0, #0 add r1, r5, #0 @@ -644,7 +644,7 @@ _0225A8CC: bl sub_0200B144 add r5, r0, #0 bne _0225A8E0 - bl sub_02022974 + bl GF_AssertFail _0225A8E0: ldr r1, [sp, #0x10] add r0, r5, #0 @@ -1179,7 +1179,7 @@ _0225ACFA: str r0, [sp, #4] cmp r0, #0xa ble _0225AD0C - bl sub_02022974 + bl GF_AssertFail _0225AD0C: ldr r0, [r5, #0x10] ldr r1, [sp, #4] diff --git a/asm/ov22_0225B660.s b/asm/ov22_0225B660.s index a34269d33f..0073e468ae 100644 --- a/asm/ov22_0225B660.s +++ b/asm/ov22_0225B660.s @@ -593,7 +593,7 @@ ov22_0225BB00: ; 0x0225BB00 str r0, [sp, #0x10] cmp r0, #0 bne _0225BB1C - bl sub_02022974 + bl GF_AssertFail _0225BB1C: mov r0, #0xd bl sub_0200B358 @@ -771,7 +771,7 @@ ov22_0225BC18: ; 0x0225BC18 str r0, [sp, #0x10] cmp r0, #0 bne _0225BCC4 - bl sub_02022974 + bl GF_AssertFail _0225BCC4: ldr r0, [sp, #0x10] mov r1, #0x2b diff --git a/asm/ov23_0223E140.s b/asm/ov23_0223E140.s index 463bb91e6d..7cbf55f871 100644 --- a/asm/ov23_0223E140.s +++ b/asm/ov23_0223E140.s @@ -2843,7 +2843,7 @@ _0223F7E8: add r5, #0xc cmp r1, #8 blt _0223F79E - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -3140,7 +3140,7 @@ _0223FA0C: cmp r4, #0x55 blo _0223F9F8 _0223FA14: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} ; .align 2, 0 @@ -6367,7 +6367,7 @@ ov23_022412F0: ; 0x022412F0 ldr r0, [r1, r0] cmp r0, #0 beq _02241302 - bl sub_02022974 + bl GF_AssertFail _02241302: ldr r0, _02241350 ; =0x02257740 ldr r1, [r0, #0] @@ -6375,7 +6375,7 @@ _02241302: ldr r0, [r1, r0] cmp r0, #0 beq _02241312 - bl sub_02022974 + bl GF_AssertFail _02241312: mov r1, #0x5e mov r0, #0xb diff --git a/asm/ov23_022416A8.s b/asm/ov23_022416A8.s index c72cc7179f..6de34d8b0d 100644 --- a/asm/ov23_022416A8.s +++ b/asm/ov23_022416A8.s @@ -309,7 +309,7 @@ ov23_022418C0: ; 0x022418C0 add r4, r0, #0 cmp r4, #0x64 blt _022418EA - bl sub_02022974 + bl GF_AssertFail _022418EA: mov r5, #0x63 cmp r4, #0x63 @@ -767,7 +767,7 @@ _02241C66: mvn r0, r0 cmp r1, r0 bne _02241C72 - bl sub_02022974 + bl GF_AssertFail _02241C72: cmp r4, #0x63 bge _02241C92 @@ -817,7 +817,7 @@ ov23_02241CAC: ; 0x02241CAC bl ov23_02241960 add r5, r0, #0 bne _02241CD8 - bl sub_02022974 + bl GF_AssertFail _02241CD8: add r0, r4, #0 add r1, r5, #0 @@ -1045,7 +1045,7 @@ ov23_02241E6C: ; 0x02241E6C ldr r0, [r1, r0] cmp r0, #0 beq _02241E7E - bl sub_02022974 + bl GF_AssertFail _02241E7E: ldr r0, _02241EC4 ; =0x02257744 ldr r1, [r0, #0] @@ -1054,7 +1054,7 @@ _02241E7E: ldr r0, [r1, r0] cmp r0, #0 beq _02241E90 - bl sub_02022974 + bl GF_AssertFail _02241E90: mov r0, #0xb mov r1, #4 diff --git a/asm/ov23_02241F74.s b/asm/ov23_02241F74.s index 2750186179..c300447b14 100644 --- a/asm/ov23_02241F74.s +++ b/asm/ov23_02241F74.s @@ -2307,7 +2307,7 @@ _02243142: add r2, #8 cmp r6, #0x14 blt _02243120 - bl sub_02022974 + bl GF_AssertFail _0224314E: pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -2516,7 +2516,7 @@ _022432AA: ldr r0, [r1, r0] cmp r0, #0x64 ble _022432C8 - bl sub_02022974 + bl GF_AssertFail _022432C8: mov r0, #0 pop {r3, r4, r5, pc} diff --git a/asm/ov23_0224340C.s b/asm/ov23_0224340C.s index 675d9fc11c..f65db725f3 100644 --- a/asm/ov23_0224340C.s +++ b/asm/ov23_0224340C.s @@ -1556,7 +1556,7 @@ ov23_02243F9C: ; 0x02243F9C bne _02244012 cmp r4, #0x60 beq _02243FCA - bl sub_02022974 + bl GF_AssertFail _02243FCA: mov r0, #0 add r4, r0, #0 @@ -1774,7 +1774,7 @@ ov23_02244140: ; 0x02244140 lsr r0, r0, #0x1c cmp r0, #8 blo _02244152 - bl sub_02022974 + bl GF_AssertFail _02244152: ldrb r3, [r4, #7] lsl r0, r3, #0x19 @@ -1915,7 +1915,7 @@ _02244288: add r1, r1, #6 cmp r3, #0xc0 blt _0224427A - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -3427,7 +3427,7 @@ ov23_02244D80: ; 0x02244D80 ldr r0, [r1, r0] cmp r0, #0 beq _02244DAE - bl sub_02022974 + bl GF_AssertFail _02244DAE: ldr r0, _02244DD8 ; =0x02257760 mov r2, #0x64 diff --git a/asm/ov23_02248F1C.s b/asm/ov23_02248F1C.s index bf5ee14415..63d0d83ed4 100644 --- a/asm/ov23_02248F1C.s +++ b/asm/ov23_02248F1C.s @@ -1127,7 +1127,7 @@ _022497E8: _022497F6: cmp r4, #2 blt _022497FE - bl sub_02022974 + bl GF_AssertFail _022497FE: cmp r4, #0 bne _02249810 diff --git a/asm/ov23_02249918.s b/asm/ov23_02249918.s index 9c1c78414e..2a8bfa15d0 100644 --- a/asm/ov23_02249918.s +++ b/asm/ov23_02249918.s @@ -43,7 +43,7 @@ ov23_0224993C: ; 0x0224993C add r5, r0, #0 cmp r4, #8 blt _0224994A - bl sub_02022974 + bl GF_AssertFail _0224994A: mov r0, #0xc add r5, #0x18 diff --git a/asm/ov23_0224A1D0.s b/asm/ov23_0224A1D0.s index 57bfe82419..95a13be625 100644 --- a/asm/ov23_0224A1D0.s +++ b/asm/ov23_0224A1D0.s @@ -332,7 +332,7 @@ ov23_0224A410: ; 0x0224A410 ldrb r0, [r5, #1] cmp r0, #8 blo _0224A42E - bl sub_02022974 + bl GF_AssertFail _0224A42E: ldrb r0, [r5] cmp r0, #4 @@ -1146,11 +1146,11 @@ _0224AAE8: add r5, r0, #0 cmp r4, #0 bne _0224AB02 - bl sub_02022974 + bl GF_AssertFail _0224AB02: cmp r5, #0 bne _0224AB0A - bl sub_02022974 + bl GF_AssertFail _0224AB0A: add r0, r4, #0 add r1, r5, #0 @@ -1236,7 +1236,7 @@ _0224AB8C: strb r1, [r7, r0] pop {r3, r4, r5, r6, r7, pc} _0224ABB0: - bl sub_02022974 + bl GF_AssertFail add sp, #8 pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -1754,7 +1754,7 @@ ov23_0224AF4C: ; 0x0224AF4C bl sub_0207136C b _0224AF74 _0224AF70: - bl sub_02022974 + bl GF_AssertFail _0224AF74: mov r0, #0 str r0, [r5, r4] diff --git a/asm/ov23_0224B05C.s b/asm/ov23_0224B05C.s index 3a34678424..6924ae6bfb 100644 --- a/asm/ov23_0224B05C.s +++ b/asm/ov23_0224B05C.s @@ -155,7 +155,7 @@ _0224B154: bl sub_02028554 cmp r0, #0x94 beq _0224B160 - bl sub_02022974 + bl GF_AssertFail _0224B160: ldr r0, _0224B274 ; =0x022577AC ldr r2, _0224B278 ; =0x000013E8 @@ -913,7 +913,7 @@ ov23_0224B730: ; 0x0224B730 bl sub_0203608C cmp r0, #0 beq _0224B748 - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} _0224B748: ldrb r0, [r4, #1] @@ -1640,7 +1640,7 @@ ov23_0224BCC4: ; 0x0224BCC4 ldr r0, [r0, #0] cmp r0, #2 beq _0224BD0E - bl sub_02022974 + bl GF_AssertFail _0224BD0E: mov r0, #2 str r0, [r4, #0x14] @@ -2351,7 +2351,7 @@ _0224C29C: ldrb r5, [r6] cmp r5, #0x11 blt _0224C2B0 - bl sub_02022974 + bl GF_AssertFail _0224C2B0: ldr r0, _0224C368 ; =0x022577AC mov r2, #0x96 @@ -5300,7 +5300,7 @@ _0224D9F8: cmp r4, #0 bne _0224DA2A _0224DA26: - bl sub_02022974 + bl GF_AssertFail _0224DA2A: add r0, r7, #0 bl sub_0206419C diff --git a/asm/ov23_0224DC40.s b/asm/ov23_0224DC40.s index 3644923174..8de0e3d1f2 100644 --- a/asm/ov23_0224DC40.s +++ b/asm/ov23_0224DC40.s @@ -2526,7 +2526,7 @@ ov23_0224F07C: ; 0x0224F07C add r6, r2, #0 cmp r0, #0 beq _0224F090 - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} _0224F090: mov r0, #0x21 @@ -2605,7 +2605,7 @@ ov23_0224F108: ; 0x0224F108 beq _0224F132 cmp r5, #2 beq _0224F128 - bl sub_02022974 + bl GF_AssertFail _0224F128: ldr r0, _0224F134 ; =0x022577B0 ldrb r1, [r4, #1] @@ -2633,13 +2633,13 @@ ov23_0224F138: ; 0x0224F138 beq _0224F16E cmp r5, #2 beq _0224F158 - bl sub_02022974 + bl GF_AssertFail _0224F158: ldr r0, _0224F170 ; =0x022577B0 ldr r0, [r0, #4] cmp r0, #0 bne _0224F164 - bl sub_02022974 + bl GF_AssertFail _0224F164: ldr r0, _0224F170 ; =0x022577B0 ldrb r1, [r4, #1] @@ -2682,7 +2682,7 @@ ov23_0224F184: ; 0x0224F184 ldr r0, [r0, #0] cmp r0, #0 bne _0224F1A2 - bl sub_02022974 + bl GF_AssertFail _0224F1A2: add r0, r4, #0 add r0, #0x34 diff --git a/asm/ov23_0224F294.s b/asm/ov23_0224F294.s index 2b0b3ec04a..c6487e5820 100644 --- a/asm/ov23_0224F294.s +++ b/asm/ov23_0224F294.s @@ -489,7 +489,7 @@ ov23_0224F634: ; 0x0224F634 ldrb r1, [r1, #5] cmp r1, r0 beq _0224F644 - bl sub_02022974 + bl GF_AssertFail _0224F644: ldr r0, _0224F654 ; =0x022577B8 ldr r1, [r0, #0] @@ -582,7 +582,7 @@ ov23_0224F6E0: ; 0x0224F6E0 add r4, r1, #0 cmp r5, #0xb blt _0224F6EE - bl sub_02022974 + bl GF_AssertFail _0224F6EE: cmp r5, #6 blt _0224F6F4 @@ -609,7 +609,7 @@ ov23_0224F710: ; 0x0224F710 add r4, r0, #0 cmp r4, #0x3c blt _0224F71C - bl sub_02022974 + bl GF_AssertFail _0224F71C: ldr r0, _0224F72C ; =0x022577B8 add r1, r4, #0 @@ -1846,7 +1846,7 @@ ov23_02250128: ; 0x02250128 ldrb r1, [r1, #5] cmp r1, r0 beq _02250138 - bl sub_02022974 + bl GF_AssertFail _02250138: ldr r0, _02250148 ; =0x022577B8 ldr r1, [r0, #0] diff --git a/asm/ov23_022521F0.s b/asm/ov23_022521F0.s index 31d272adfa..c3a2d5b08b 100644 --- a/asm/ov23_022521F0.s +++ b/asm/ov23_022521F0.s @@ -1545,7 +1545,7 @@ _02252E5C: add r5, r5, #6 cmp r3, #0x14 blt _02252E42 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} ; .align 2, 0 diff --git a/asm/ov23_02253598.s b/asm/ov23_02253598.s index 7d995eda7d..5cad22b00b 100644 --- a/asm/ov23_02253598.s +++ b/asm/ov23_02253598.s @@ -578,11 +578,11 @@ ov23_02253A00: ; 0x02253A00 cmp r5, #0x20 ldr r4, [r0, r1] bge _02253A18 - bl sub_02022974 + bl GF_AssertFail _02253A18: cmp r5, #0x2d ble _02253A20 - bl sub_02022974 + bl GF_AssertFail _02253A20: bl sub_020594FC bl ov23_022421BC diff --git a/asm/ov23_02253D40.s b/asm/ov23_02253D40.s index fc13de8faa..d39b02c490 100644 --- a/asm/ov23_02253D40.s +++ b/asm/ov23_02253D40.s @@ -121,7 +121,7 @@ ov23_02253DFC: ; 0x02253DFC str r0, [r5, #0x24] cmp r0, #0 bne _02253E28 - bl sub_02022974 + bl GF_AssertFail _02253E28: pop {r4, r5, r6, pc} ; .align 2, 0 diff --git a/asm/ov23_02254A14.s b/asm/ov23_02254A14.s index 30403c2f67..2c56859947 100644 --- a/asm/ov23_02254A14.s +++ b/asm/ov23_02254A14.s @@ -15,7 +15,7 @@ ov23_02254A14: ; 0x02254A14 add r7, r2, #0 cmp r5, #0 bne _02254A26 - bl sub_02022974 + bl GF_AssertFail _02254A26: add r4, r7, #0 add r4, #0x3c @@ -93,7 +93,7 @@ ov23_02254AA4: ; 0x02254AA4 ldr r0, [r0, #0x5c] cmp r0, #0 bne _02254ABA - bl sub_02022974 + bl GF_AssertFail _02254ABA: add r2, r5, r4 add r2, #0x60 @@ -560,7 +560,7 @@ _02254E90: str r0, [r4, #4] b _022550DE _02254EA6: - bl sub_02022974 + bl GF_AssertFail b _022550DE _02254EAC: ldr r0, _022550E8 ; =0x000004DC @@ -1100,14 +1100,14 @@ _022552FA: ldr r0, [r0, #0x64] cmp r0, #0x20 blt _0225530E - bl sub_02022974 + bl GF_AssertFail _0225530E: ldr r0, _0225544C ; =0x000004FC ldr r0, [r4, r0] ldr r0, [r0, #0x68] cmp r0, #0x20 blt _0225531C - bl sub_02022974 + bl GF_AssertFail _0225531C: ldr r0, _0225544C ; =0x000004FC add r2, r4, #0 @@ -1178,7 +1178,7 @@ _02255392: ldrb r0, [r4, r0] cmp r0, #0 bne _022553AE - bl sub_02022974 + bl GF_AssertFail _022553AE: ldr r0, _02255458 ; =0x00000522 ldrb r1, [r4, r0] @@ -1209,7 +1209,7 @@ _022553C2: ldrb r0, [r4, r0] cmp r0, #0 bne _022553F2 - bl sub_02022974 + bl GF_AssertFail _022553F2: ldr r0, _02255460 ; =0x00000521 ldrb r1, [r4, r0] @@ -1282,7 +1282,7 @@ _02255474: ldrb r0, [r4, r0] sub r5, r1, r0 bpl _02255496 - bl sub_02022974 + bl GF_AssertFail _02255496: cmp r5, #0 bne _022554A8 @@ -1646,14 +1646,14 @@ _0225576A: ldr r0, [r0, #0x64] cmp r0, #0x20 blt _0225577E - bl sub_02022974 + bl GF_AssertFail _0225577E: ldr r0, _02255844 ; =0x000004FC ldr r0, [r5, r0] ldr r0, [r0, #0x68] cmp r0, #0x20 blt _0225578C - bl sub_02022974 + bl GF_AssertFail _0225578C: ldr r0, _02255844 ; =0x000004FC add r2, r5, #0 @@ -2183,7 +2183,7 @@ _02255BA8: add r4, #0x24 cmp r2, #0x20 blt _02255B80 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} thumb_func_end ov23_02255B78 @@ -2196,7 +2196,7 @@ ov23_02255BB8: ; 0x02255BB8 add r4, r2, #0 cmp r7, #0x20 blt _02255BC8 - bl sub_02022974 + bl GF_AssertFail _02255BC8: mov r0, #0x24 add r6, r7, #0 @@ -2204,7 +2204,7 @@ _02255BC8: ldr r0, [r4, r6] cmp r0, #0 beq _02255BD8 - bl sub_02022974 + bl GF_AssertFail _02255BD8: mov r0, #1 str r0, [r4, r6] @@ -2229,11 +2229,11 @@ ov23_02255BF4: ; 0x02255BF4 add r4, r1, #0 cmp r5, #0x20 blt _02255C02 - bl sub_02022974 + bl GF_AssertFail _02255C02: cmp r5, #0 bne _02255C0A - bl sub_02022974 + bl GF_AssertFail _02255C0A: mov r0, #0x24 add r6, r5, #0 @@ -2241,7 +2241,7 @@ _02255C0A: ldr r0, [r4, r6] cmp r0, #0 bne _02255C1A - bl sub_02022974 + bl GF_AssertFail _02255C1A: mov r1, #0 add r0, r4, r6 @@ -2522,7 +2522,7 @@ ov23_02255E14: ; 0x02255E14 add r5, r0, #0 add r4, r1, #0 bne _02255E20 - bl sub_02022974 + bl GF_AssertFail _02255E20: ldr r0, [r5, #0x30] add r1, r4, #0 @@ -2544,7 +2544,7 @@ ov23_02255E2C: ; 0x02255E2C ldr r0, [r0, #0x5c] cmp r0, #0 bne _02255E46 - bl sub_02022974 + bl GF_AssertFail _02255E46: add r0, r5, #0 add r0, #0x60 @@ -2592,7 +2592,7 @@ ov23_02255E8C: ; 0x02255E8C ldr r0, [r0, #0x5c] cmp r0, #0 bne _02255EA2 - bl sub_02022974 + bl GF_AssertFail _02255EA2: mov r0, #5 lsl r0, r0, #8 diff --git a/asm/ov25_02253CE0.s b/asm/ov25_02253CE0.s index c322221512..1656058525 100644 --- a/asm/ov25_02253CE0.s +++ b/asm/ov25_02253CE0.s @@ -231,7 +231,7 @@ _02253E56: pop {r3, r4, r5, pc} _02253E64: beq _02253E6A - bl sub_02022974 + bl GF_AssertFail _02253E6A: ldr r0, [r4, #0x34] mov r1, #0 @@ -651,7 +651,7 @@ ov25_02254170: ; 0x02254170 cmp r4, #0x19 blo _02254180 _0225417C: - bl sub_02022974 + bl GF_AssertFail _02254180: mov r0, #0 ldr r1, [r5, #0x14] @@ -710,7 +710,7 @@ ov25_022541D8: ; 0x022541D8 ldrb r0, [r4, #2] cmp r0, #0 beq _022541E6 - bl sub_02022974 + bl GF_AssertFail _022541E6: add r0, r4, #0 ldr r2, [r4, #0x4c] @@ -745,7 +745,7 @@ ov25_0225420C: ; 0x0225420C ldrb r0, [r4, #2] cmp r0, #2 beq _0225421A - bl sub_02022974 + bl GF_AssertFail _0225421A: ldr r0, [r4, #0x24] ldr r1, [r4, #0x40] @@ -789,7 +789,7 @@ ov25_0225424C: ; 0x0225424C ldrb r0, [r4, #2] cmp r0, #1 beq _0225425A - bl sub_02022974 + bl GF_AssertFail _0225425A: mov r0, #2 strb r0, [r4, #2] @@ -803,7 +803,7 @@ ov25_02254260: ; 0x02254260 ldrb r0, [r4, #2] cmp r0, #3 beq _0225426E - bl sub_02022974 + bl GF_AssertFail _0225426E: mov r0, #0 strb r0, [r4, #2] diff --git a/asm/ov25_02255090.s b/asm/ov25_02255090.s index 53c32f41a4..7063302503 100644 --- a/asm/ov25_02255090.s +++ b/asm/ov25_02255090.s @@ -36,7 +36,7 @@ ov25_022550B0: ; 0x022550B0 ldr r0, _022550EC ; =0x12345678 cmp r1, r0 beq _022550C2 - bl sub_02022974 + bl GF_AssertFail _022550C2: ldr r6, [r5, #0] mov r2, #0 @@ -74,7 +74,7 @@ ov25_022550F0: ; 0x022550F0 ldr r0, _0225512C ; =0x12345678 cmp r1, r0 beq _02255102 - bl sub_02022974 + bl GF_AssertFail _02255102: ldr r3, [r5, #0] mov r2, #0 @@ -97,7 +97,7 @@ _0225511E: cmp r2, r3 blo _0225510C _02255126: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} ; .align 2, 0 _0225512C: .word 0x12345678 @@ -230,7 +230,7 @@ _02255202: add sp, #0xc pop {r4, r5, r6, r7, pc} _0225520C: - bl sub_02022974 + bl GF_AssertFail b _0225521C _02255212: add r3, #0xc @@ -239,7 +239,7 @@ _02255212: cmp r2, r1 bne _02255196 _0225521C: - bl sub_02022974 + bl GF_AssertFail _02255220: add sp, #0xc pop {r4, r5, r6, r7, pc} diff --git a/asm/ov25_02255ACC.s b/asm/ov25_02255ACC.s index 173c39fad0..44bbf2982c 100644 --- a/asm/ov25_02255ACC.s +++ b/asm/ov25_02255ACC.s @@ -16,7 +16,7 @@ ov25_02255ACC: ; 0x02255ACC str r3, [sp, #4] ldr r5, [sp, #0x20] bne _02255AE0 - bl sub_02022974 + bl GF_AssertFail _02255AE0: add r0, r5, #0 mov r1, #0x18 @@ -66,7 +66,7 @@ ov25_02255B34: ; 0x02255B34 push {r4, lr} add r4, r0, #0 bne _02255B3E - bl sub_02022974 + bl GF_AssertFail _02255B3E: ldr r0, [r4, #8] ldr r1, [r4, #0x14] diff --git a/asm/ov25_02255DBC.s b/asm/ov25_02255DBC.s index 576ff8df85..9c13b6b94b 100644 --- a/asm/ov25_02255DBC.s +++ b/asm/ov25_02255DBC.s @@ -15,11 +15,11 @@ ov25_02255DBC: ; 0x02255DBC add r7, r3, #0 cmp r5, #0x1e blo _02255DCE - bl sub_02022974 + bl GF_AssertFail _02255DCE: cmp r4, #0x21 blo _02255DD6 - bl sub_02022974 + bl GF_AssertFail _02255DD6: cmp r5, #0x1e blo _02255DDC @@ -51,7 +51,7 @@ ov25_02255DFC: ; 0x02255DFC add r6, r2, #0 cmp r5, #4 blo _02255E0C - bl sub_02022974 + bl GF_AssertFail _02255E0C: ldr r0, _02255E1C ; =0x02256090 lsl r1, r5, #3 diff --git a/asm/ov29_022566C8.s b/asm/ov29_022566C8.s index 1ee83fe402..78013ed0c0 100644 --- a/asm/ov29_022566C8.s +++ b/asm/ov29_022566C8.s @@ -20,7 +20,7 @@ ov29_022566C8: ; 0x022566C8 bl sub_0201833C cmp r0, #0 bne _022566E8 - bl sub_02022974 + bl GF_AssertFail _022566E8: add r0, r4, #0 add r0, #8 @@ -30,7 +30,7 @@ _022566E8: bl sub_0201833C cmp r0, #0 bne _02256700 - bl sub_02022974 + bl GF_AssertFail _02256700: str r6, [r4, #0] bl ov25_02254674 @@ -41,7 +41,7 @@ _02256700: bl sub_0201833C cmp r0, #0 bne _0225671C - bl sub_02022974 + bl GF_AssertFail _0225671C: str r4, [r5, #0] mov r0, #1 @@ -98,7 +98,7 @@ ov29_02256770: ; 0x02256770 bl sub_0201833C cmp r0, #0 bne _02256784 - bl sub_02022974 + bl GF_AssertFail _02256784: ldr r2, [r4, #0x70] cmp r2, #0 @@ -182,7 +182,7 @@ ov29_02256804: ; 0x02256804 bl sub_0201833C cmp r0, #0 bne _02256818 - bl sub_02022974 + bl GF_AssertFail _02256818: add r0, r4, #0 bl ov25_0225523C @@ -201,7 +201,7 @@ _02256818: bl sub_0201833C cmp r0, #0 bne _02256846 - bl sub_02022974 + bl GF_AssertFail _02256846: mov r0, #0 str r0, [sp] @@ -234,7 +234,7 @@ _02256846: bl sub_0201833C cmp r0, #0 bne _02256890 - bl sub_02022974 + bl GF_AssertFail _02256890: add r0, r5, #0 bl ov29_02256728 @@ -244,7 +244,7 @@ _02256890: bl sub_0201833C cmp r0, #0 bne _022568AA - bl sub_02022974 + bl GF_AssertFail _022568AA: add r0, r5, #0 bl ov29_02256ABC @@ -252,7 +252,7 @@ _022568AA: bl sub_0201833C cmp r0, #0 bne _022568BE - bl sub_02022974 + bl GF_AssertFail _022568BE: ldr r0, [r5, #4] mov r1, #7 @@ -276,7 +276,7 @@ _022568BE: bl sub_0201833C cmp r0, #0 bne _022568F4 - bl sub_02022974 + bl GF_AssertFail _022568F4: add sp, #0x14 pop {r4, r5, pc} diff --git a/asm/ov33_02256474.s b/asm/ov33_02256474.s index 4983259484..dff465dc26 100644 --- a/asm/ov33_02256474.s +++ b/asm/ov33_02256474.s @@ -374,7 +374,7 @@ _022566A4: bl ov25_02255938 b _02256760 _0225675C: - bl sub_02022974 + bl GF_AssertFail _02256760: ldrh r0, [r4, #8] ldrh r1, [r4, #0xc] diff --git a/asm/ov41_022567B0.s b/asm/ov41_022567B0.s index 76fd8fbeec..ca70575ae0 100644 --- a/asm/ov41_022567B0.s +++ b/asm/ov41_022567B0.s @@ -184,7 +184,7 @@ ov41_022568DC: ; 0x022568DC bl sub_0201833C cmp r0, #0 bne _022568F0 - bl sub_02022974 + bl GF_AssertFail _022568F0: add r0, r5, #0 bl ov25_0225523C @@ -203,7 +203,7 @@ _022568F0: bl sub_0201833C cmp r0, #0 bne _0225691E - bl sub_02022974 + bl GF_AssertFail _0225691E: mov r0, #0 str r0, [sp] @@ -237,7 +237,7 @@ _0225691E: bl sub_0201833C cmp r0, #0 bne _0225696A - bl sub_02022974 + bl GF_AssertFail _0225696A: add r0, r4, #0 lsr r1, r6, #5 @@ -264,7 +264,7 @@ _0225696A: bl sub_0201833C cmp r0, #0 bne _022569A8 - bl sub_02022974 + bl GF_AssertFail _022569A8: add sp, #0x14 pop {r3, r4, r5, r6, pc} diff --git a/asm/ov4_021D0D80.s b/asm/ov4_021D0D80.s index fd815de01e..8d7e6e686f 100644 --- a/asm/ov4_021D0D80.s +++ b/asm/ov4_021D0D80.s @@ -18,7 +18,7 @@ ov4_021D0D80: ; 0x021D0D80 str r3, [sp] cmp r0, #0 beq _021D0D98 - bl sub_02022974 + bl GF_AssertFail _021D0D98: ldr r1, _021D0F48 ; =0x00001108 add r0, r5, #0 @@ -505,7 +505,7 @@ ov4_021D116C: ; 0x021D116C add r7, r3, #0 cmp r0, #0 bne _021D1184 - bl sub_02022974 + bl GF_AssertFail _021D1184: ldr r0, _021D127C ; =0x0221A400 ldr r1, [r0, #0] @@ -532,7 +532,7 @@ _021D1196: blx ov4_021DC9AC cmp r0, #0 beq _021D11BC - bl sub_02022974 + bl GF_AssertFail _021D11BC: ldr r1, _021D1288 ; =0x02215E94 mov r0, #0 @@ -540,7 +540,7 @@ _021D11BC: blx ov4_021DC87C cmp r0, #0 bne _021D11CE - bl sub_02022974 + bl GF_AssertFail _021D11CE: ldr r0, _021D127C ; =0x0221A400 mov r2, #0x80 @@ -564,7 +564,7 @@ _021D11CE: bl strlen cmp r0, #0x80 blo _021D1204 - bl sub_02022974 + bl GF_AssertFail _021D1204: cmp r6, #0 beq _021D1218 @@ -1346,7 +1346,7 @@ _021D17F0: blx ov4_021E4E60 cmp r0, #0 bne _021D1816 - bl sub_02022974 + bl GF_AssertFail _021D1816: ldr r0, [r6, #0] add r5, r5, #1 @@ -1360,7 +1360,7 @@ _021D1822: blx ov4_021E4E60 cmp r0, #0 bne _021D1832 - bl sub_02022974 + bl GF_AssertFail _021D1832: ldr r0, _021D1844 ; =0x0221A400 mov r2, #1 @@ -2479,7 +2479,7 @@ _021D207E: mov r0, #0xa pop {r4, r5, r6, pc} _021D2082: - bl sub_02022974 + bl GF_AssertFail b _021D208C _021D2088: mov r0, #0xf diff --git a/asm/ov4_021D2808.s b/asm/ov4_021D2808.s index 894e447100..4b6a96c5ff 100644 --- a/asm/ov4_021D2808.s +++ b/asm/ov4_021D2808.s @@ -775,7 +775,7 @@ _021D2DD8: mvn r0, r0 cmp r1, r0 bne _021D2E02 - bl sub_02022974 + bl GF_AssertFail _021D2E02: ldr r0, _021D2E54 ; =0x0221A404 ldr r1, _021D2E78 ; =0x000019E8 diff --git a/asm/ov56_022561C0.s b/asm/ov56_022561C0.s index 513b8d2bec..fd07c5e7e4 100644 --- a/asm/ov56_022561C0.s +++ b/asm/ov56_022561C0.s @@ -382,7 +382,7 @@ _0225649C: bl sub_020067D0 pop {r3, r4, r5, r6, r7, pc} _022564DE: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov56_02256468 diff --git a/asm/ov58_021D0D80.s b/asm/ov58_021D0D80.s index 82d792f300..f9719bb89b 100644 --- a/asm/ov58_021D0D80.s +++ b/asm/ov58_021D0D80.s @@ -2004,7 +2004,7 @@ ov58_021D1DFC: ; 0x021D1DFC bl ov58_021D2CEC cmp r0, #0 bne _021D1E38 - bl sub_02022974 + bl GF_AssertFail _021D1E38: add r0, r5, #0 mov r1, #6 @@ -2395,7 +2395,7 @@ ov58_021D2130: ; 0x021D2130 bl ov58_021D2CEC cmp r0, #0 bne _021D216C - bl sub_02022974 + bl GF_AssertFail _021D216C: add r0, r5, #0 mov r1, #0xe @@ -3893,7 +3893,7 @@ _021D2C44: _021D2C90: cmp r0, #0 bne _021D2C98 - bl sub_02022974 + bl GF_AssertFail _021D2C98: mov r0, #1 pop {r3, r4, r5, pc} diff --git a/asm/ov59_021D0D80.s b/asm/ov59_021D0D80.s index dd1d59ee66..d042d82855 100644 --- a/asm/ov59_021D0D80.s +++ b/asm/ov59_021D0D80.s @@ -1889,7 +1889,7 @@ _021D1CD2: strb r0, [r5, r1] b _021D1CF0 _021D1CEC: - bl sub_02022974 + bl GF_AssertFail _021D1CF0: mov r0, #0x32 mov r1, #0 @@ -2751,7 +2751,7 @@ _021D237A: str r4, [r5, r0] pop {r3, r4, r5, r6, pc} _021D2384: - bl sub_02022974 + bl GF_AssertFail add sp, #4 pop {r3, r4, r5, r6, pc} _021D238C: @@ -3255,7 +3255,7 @@ _021D2728: ldr r0, [r6, r0] cmp r0, #0 bne _021D2736 - bl sub_02022974 + bl GF_AssertFail _021D2736: mov r0, #0xd9 lsl r0, r0, #2 diff --git a/asm/ov59_021D2A2C.s b/asm/ov59_021D2A2C.s index 366f6f39c7..f028b53be1 100644 --- a/asm/ov59_021D2A2C.s +++ b/asm/ov59_021D2A2C.s @@ -69,7 +69,7 @@ ov59_021D2A78: ; 0x021D2A78 cmp r5, #5 ble _021D2A8A _021D2A86: - bl sub_02022974 + bl GF_AssertFail _021D2A8A: add r2, r5, #1 cmp r2, #5 diff --git a/asm/ov59_021D2B44.s b/asm/ov59_021D2B44.s index e7c74e51be..687aa555bd 100644 --- a/asm/ov59_021D2B44.s +++ b/asm/ov59_021D2B44.s @@ -156,7 +156,7 @@ ov59_021D2C28: ; 0x021D2C28 bl ov59_021D2B44 cmp r4, r0 beq _021D2C50 - bl sub_02022974 + bl GF_AssertFail _021D2C50: mov r0, #1 mov r2, #0x63 @@ -192,7 +192,7 @@ ov59_021D2C70: ; 0x021D2C70 bl ov59_021D2B4C cmp r4, r0 beq _021D2C98 - bl sub_02022974 + bl GF_AssertFail _021D2C98: mov r0, #1 add r6, #0xc @@ -226,7 +226,7 @@ ov59_021D2CB4: ; 0x021D2CB4 bl ov59_021D2B54 cmp r4, r0 beq _021D2CDC - bl sub_02022974 + bl GF_AssertFail _021D2CDC: mov r0, #1 str r0, [sp] @@ -260,7 +260,7 @@ ov59_021D2CF8: ; 0x021D2CF8 bl ov59_021D2B44 cmp r4, r0 beq _021D2D20 - bl sub_02022974 + bl GF_AssertFail _021D2D20: mov r0, #0 mov r2, #0x63 @@ -294,7 +294,7 @@ ov59_021D2D3C: ; 0x021D2D3C bl ov59_021D2B4C cmp r4, r0 beq _021D2D64 - bl sub_02022974 + bl GF_AssertFail _021D2D64: mov r0, #0 str r0, [sp] @@ -328,7 +328,7 @@ ov59_021D2D80: ; 0x021D2D80 bl ov59_021D2B54 cmp r4, r0 beq _021D2DA8 - bl sub_02022974 + bl GF_AssertFail _021D2DA8: mov r0, #0 str r0, [sp] diff --git a/asm/ov59_021D2F88.s b/asm/ov59_021D2F88.s index f10ae6bd3d..f38d1df892 100644 --- a/asm/ov59_021D2F88.s +++ b/asm/ov59_021D2F88.s @@ -226,7 +226,7 @@ _021D30F0: add r7, r0, #0 cmp r6, r4 bhi _021D310C - bl sub_02022974 + bl GF_AssertFail _021D310C: ldr r1, [sp, #4] add r0, r7, #0 @@ -329,7 +329,7 @@ _021D31BE: str r0, [sp, #0x18] cmp r1, r0 bhi _021D31D2 - bl sub_02022974 + bl GF_AssertFail _021D31D2: mov r6, #0 ldr r4, [sp, #4] diff --git a/asm/ov5_021D0D80.s b/asm/ov5_021D0D80.s index 289edb560a..1d6fb911ff 100644 --- a/asm/ov5_021D0D80.s +++ b/asm/ov5_021D0D80.s @@ -102,7 +102,7 @@ _021D0E3A: ldr r0, [r4, #4] cmp r0, #0 beq _021D0E50 - bl sub_02022974 + bl GF_AssertFail _021D0E50: mov r0, #4 mov r1, #0x28 @@ -293,7 +293,7 @@ _021D0FD6: ldr r0, [r4, #0x50] cmp r0, #0 bne _021D1014 - bl sub_02022974 + bl GF_AssertFail _021D1014: ldr r0, [r4, #0x28] bl ov5_021E924C @@ -1204,7 +1204,7 @@ _021D1766: add sp, #0xc pop {pc} _021D1786: - bl sub_02022974 + bl GF_AssertFail add sp, #0xc pop {pc} ; .align 2, 0 @@ -1239,7 +1239,7 @@ ov5_021D1790: ; 0x021D1790 ldr r0, [r5, #0x34] cmp r0, #0 beq _021D17D6 - bl sub_02022974 + bl GF_AssertFail _021D17D6: mov r0, #4 add r1, r4, #0 diff --git a/asm/ov5_021D1A94.s b/asm/ov5_021D1A94.s index 2eff2af452..17561e41b2 100644 --- a/asm/ov5_021D1A94.s +++ b/asm/ov5_021D1A94.s @@ -155,12 +155,12 @@ _021D1B7C: ldr r0, [r4, #4] cmp r0, #0 bne _021D1BAA - bl sub_02022974 + bl GF_AssertFail _021D1BAA: ldr r0, [r4, #8] cmp r0, #0 bne _021D1BB4 - bl sub_02022974 + bl GF_AssertFail _021D1BB4: ldrh r1, [r6, #4] cmp r1, #0 @@ -185,7 +185,7 @@ _021D1BD4: cmp r1, r2 blt _021D1B7C _021D1BDC: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} ; .align 2, 0 diff --git a/asm/ov5_021D1C30.s b/asm/ov5_021D1C30.s index b84ded2db1..ab4df50f9c 100644 --- a/asm/ov5_021D1C30.s +++ b/asm/ov5_021D1C30.s @@ -1715,7 +1715,7 @@ _021D2A08: mov r0, #2 b _021D2A1A _021D2A10: - bl sub_02022974 + bl GF_AssertFail add sp, #0x20 mov r0, #0 pop {r3, r4, r5, pc} @@ -1743,7 +1743,7 @@ _021D2A34: beq _021D2A56 cmp r0, #3 beq _021D2A56 - bl sub_02022974 + bl GF_AssertFail add sp, #0x20 mov r0, #0 pop {r3, r4, r5, pc} @@ -2173,7 +2173,7 @@ _021D2D60: ldr r0, _021D2DC8 ; =0x00000FFF cmp r1, r0 beq _021D2D76 - bl sub_02022974 + bl GF_AssertFail _021D2D76: ldr r0, [r4, #0xc] bl sub_0203A790 diff --git a/asm/ov5_021D2F14.s b/asm/ov5_021D2F14.s index 38a3270b64..1460f564c6 100644 --- a/asm/ov5_021D2F14.s +++ b/asm/ov5_021D2F14.s @@ -300,7 +300,7 @@ ov5_021D3104: ; 0x021D3104 bl sub_02021AA0 add r5, r0, #0 bne _021D3174 - bl sub_02022974 + bl GF_AssertFail _021D3174: ldrh r1, [r4, #0xa] add r0, r5, #0 @@ -451,7 +451,7 @@ ov5_021D3270: ; 0x021D3270 bl sub_02009D34 cmp r0, #0 bne _021D3294 - bl sub_02022974 + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} _021D3294: @@ -475,7 +475,7 @@ _021D3294: bl sub_0200A640 cmp r0, #1 beq _021D32C4 - bl sub_02022974 + bl GF_AssertFail _021D32C4: mov r0, #0x53 lsl r0, r0, #2 @@ -488,7 +488,7 @@ _021D32C4: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} _021D32DC: - bl sub_02022974 + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -510,7 +510,7 @@ ov5_021D32E8: ; 0x021D32E8 bl sub_02009D34 cmp r0, #0 bne _021D330C - bl sub_02022974 + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} _021D330C: @@ -534,7 +534,7 @@ _021D330C: bl sub_0200A640 cmp r0, #1 beq _021D333C - bl sub_02022974 + bl GF_AssertFail _021D333C: mov r0, #0x53 lsl r0, r0, #2 @@ -547,7 +547,7 @@ _021D333C: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} _021D3354: - bl sub_02022974 + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -621,7 +621,7 @@ ov5_021D33B0: ; 0x021D33B0 bl sub_02009D34 cmp r0, #0 bne _021D33D4 - bl sub_02022974 + bl GF_AssertFail add sp, #0xc pop {r4, r5, r6, r7, pc} _021D33D4: @@ -649,7 +649,7 @@ _021D33D4: add sp, #0xc pop {r4, r5, r6, r7, pc} _021D3408: - bl sub_02022974 + bl GF_AssertFail add sp, #0xc pop {r4, r5, r6, r7, pc} ; .align 2, 0 @@ -671,7 +671,7 @@ ov5_021D3414: ; 0x021D3414 bl sub_02009D34 cmp r0, #0 bne _021D3438 - bl sub_02022974 + bl GF_AssertFail add sp, #0xc pop {r4, r5, r6, r7, pc} _021D3438: @@ -699,7 +699,7 @@ _021D3438: add sp, #0xc pop {r4, r5, r6, r7, pc} _021D346C: - bl sub_02022974 + bl GF_AssertFail add sp, #0xc pop {r4, r5, r6, r7, pc} ; .align 2, 0 @@ -757,7 +757,7 @@ ov5_021D34AC: ; 0x021D34AC bl sub_02009D34 cmp r0, #0 bne _021D34D6 - bl sub_02022974 + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} _021D34D6: @@ -782,11 +782,11 @@ _021D34D6: bl ov5_021D3478 cmp r0, #1 beq _021D3510 - bl sub_02022974 + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} _021D350C: - bl sub_02022974 + bl GF_AssertFail _021D3510: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -812,7 +812,7 @@ ov5_021D3518: ; 0x021D3518 bl sub_02009D34 cmp r0, #0 bne _021D3542 - bl sub_02022974 + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} _021D3542: @@ -837,11 +837,11 @@ _021D3542: bl ov5_021D3478 cmp r0, #1 beq _021D357C - bl sub_02022974 + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} _021D3578: - bl sub_02022974 + bl GF_AssertFail _021D357C: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -1068,7 +1068,7 @@ _021D370A: bl sub_02021E90 b _021D3752 _021D374E: - bl sub_02022974 + bl GF_AssertFail _021D3752: add r0, r6, #0 add sp, #0x74 diff --git a/asm/ov5_021D37AC.s b/asm/ov5_021D37AC.s index 12412c73fa..d25f085fcb 100644 --- a/asm/ov5_021D37AC.s +++ b/asm/ov5_021D37AC.s @@ -18,7 +18,7 @@ ov5_021D37AC: ; 0x021D37AC add r4, r3, #0 cmp r1, r0 bne _021D37C4 - bl sub_02022974 + bl GF_AssertFail _021D37C4: mov r0, #0 add r1, r6, #0 @@ -74,7 +74,7 @@ ov5_021D380C: ; 0x021D380C add r5, r3, #0 cmp r4, r0 bne _021D3822 - bl sub_02022974 + bl GF_AssertFail _021D3822: add r0, r6, #0 add r1, r4, #0 @@ -82,14 +82,14 @@ _021D3822: bl sub_02006CB8 add r4, r0, #0 bne _021D3834 - bl sub_02022974 + bl GF_AssertFail _021D3834: add r0, r4, #0 mov r1, #0 bl NNS_G3dGetAnmByIdx add r6, r0, #0 bne _021D3844 - bl sub_02022974 + bl GF_AssertFail _021D3844: ldr r0, [sp, #0x1c] add r1, r6, #0 @@ -98,7 +98,7 @@ _021D3844: str r0, [r5, #0] cmp r5, #0 bne _021D3858 - bl sub_02022974 + bl GF_AssertFail _021D3858: ldr r0, [r5, #0] ldr r3, [sp, #0x18] @@ -268,7 +268,7 @@ ov5_021D3964: ; 0x021D3964 ldr r0, [r4, #4] cmp r0, #1 beq _021D3972 - bl sub_02022974 + bl GF_AssertFail _021D3972: ldr r0, [r4, #0x1c] pop {r4, pc} @@ -292,7 +292,7 @@ ov5_021D3978: ; 0x021D3978 bl sub_02006D28 cmp r4, #4 blt _021D399C - bl sub_02022974 + bl GF_AssertFail _021D399C: lsl r1, r4, #2 add r0, sp, #0x14 @@ -324,7 +324,7 @@ _021D39CA: ldr r0, [r4, #0x34] cmp r5, r0 bne _021D39D8 - bl sub_02022974 + bl GF_AssertFail _021D39D8: add r6, r6, #1 add r4, #0x28 @@ -380,7 +380,7 @@ _021D3A3C: add r1, #0x28 cmp r2, #0x10 blt _021D39E4 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 add sp, #0x24 pop {r4, r5, r6, r7, pc} @@ -483,7 +483,7 @@ _021D3B00: _021D3B08: cmp r4, #0x10 bne _021D3B10 - bl sub_02022974 + bl GF_AssertFail _021D3B10: ldr r0, [sp, #0x10] add r0, r0, #4 @@ -509,7 +509,7 @@ ov5_021D3B24: ; 0x021D3B24 str r3, [sp] cmp r6, #0 bne _021D3B40 - bl sub_02022974 + bl GF_AssertFail add sp, #0x18 mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -530,7 +530,7 @@ _021D3B50: bl sub_02006D28 cmp r4, #4 blt _021D3B66 - bl sub_02022974 + bl GF_AssertFail _021D3B66: lsl r1, r4, #2 add r0, sp, #8 @@ -611,7 +611,7 @@ ov5_021D3BE4: ; 0x021D3BE4 add r4, r2, #0 str r0, [sp] bne _021D3BF8 - bl sub_02022974 + bl GF_AssertFail _021D3BF8: add r0, r4, #0 bl ov5_021D3F84 @@ -751,7 +751,7 @@ ov5_021D3CE4: ; 0x021D3CE4 beq _021D3D16 cmp r5, #0 bne _021D3CF4 - bl sub_02022974 + bl GF_AssertFail _021D3CF4: ldr r0, [r5, #4] cmp r0, #0 @@ -788,7 +788,7 @@ ov5_021D3D18: ; 0x021D3D18 bl sub_02006D28 cmp r5, #4 blt _021D3D38 - bl sub_02022974 + bl GF_AssertFail _021D3D38: lsl r1, r5, #2 add r0, sp, #4 @@ -797,7 +797,7 @@ _021D3D38: mvn r0, r0 cmp r5, r0 bne _021D3D4A - bl sub_02022974 + bl GF_AssertFail _021D3D4A: mov r0, #0 mov r2, #0x28 @@ -854,7 +854,7 @@ ov5_021D3DA0: ; 0x021D3DA0 add r4, r1, #0 cmp r5, #0 bne _021D3DAE - bl sub_02022974 + bl GF_AssertFail _021D3DAE: mov r6, #0 add r1, r6, #0 @@ -870,7 +870,7 @@ _021D3DB4: ldr r0, [r6, #4] cmp r0, #0 bne _021D3DD6 - bl sub_02022974 + bl GF_AssertFail b _021D3DD6 _021D3DCE: add r1, r1, #1 @@ -880,7 +880,7 @@ _021D3DCE: _021D3DD6: cmp r6, #0 bne _021D3DDE - bl sub_02022974 + bl GF_AssertFail _021D3DDE: add r0, r6, #0 pop {r4, r5, r6, pc} @@ -902,7 +902,7 @@ ov5_021D3DE4: ; 0x021D3DE4 bl sub_02006D28 cmp r4, #4 blt _021D3E04 - bl sub_02022974 + bl GF_AssertFail _021D3E04: lsl r1, r4, #2 add r0, sp, #4 @@ -921,7 +921,7 @@ _021D3E10: ldr r0, [r4, #4] cmp r0, #0 bne _021D3E32 - bl sub_02022974 + bl GF_AssertFail b _021D3E32 _021D3E2A: add r2, r2, #1 @@ -931,7 +931,7 @@ _021D3E2A: _021D3E32: cmp r4, #0 bne _021D3E3A - bl sub_02022974 + bl GF_AssertFail _021D3E3A: add r0, r4, #0 add sp, #0x14 @@ -1206,7 +1206,7 @@ ov5_021D3FD0: ; 0x021D3FD0 add r5, r0, #0 add r4, r1, #0 bne _021D3FDC - bl sub_02022974 + bl GF_AssertFail _021D3FDC: mov r1, #0x10 mov r0, #0 @@ -1238,7 +1238,7 @@ _021D3FF6: strb r4, [r0] b _021D401A _021D4012: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _021D401A: @@ -1303,7 +1303,7 @@ ov5_021D4068: ; 0x021D4068 add r6, r2, #0 cmp r4, #4 ble _021D4078 - bl sub_02022974 + bl GF_AssertFail _021D4078: cmp r5, #0 beq _021D407E @@ -1323,7 +1323,7 @@ ov5_021D4084: ; 0x021D4084 add r6, r2, #0 cmp r4, r0 blt _021D4096 - bl sub_02022974 + bl GF_AssertFail _021D4096: lsl r0, r4, #2 str r6, [r5, r0] @@ -1339,7 +1339,7 @@ ov5_021D409C: ; 0x021D409C add r4, r1, #0 cmp r4, r0 blt _021D40AE - bl sub_02022974 + bl GF_AssertFail _021D40AE: lsl r0, r4, #2 ldr r0, [r5, r0] @@ -1409,7 +1409,7 @@ _021D4110: bl ov5_021D3978 add r4, r0, #0 bne _021D4136 - bl sub_02022974 + bl GF_AssertFail _021D4136: ldr r0, [sp, #0x4c] add r1, r5, #0 @@ -1509,7 +1509,7 @@ ov5_021D41C8: ; 0x021D41C8 bl ov5_021D3FD0 add r5, r0, #0 bne _021D41E6 - bl sub_02022974 + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} _021D41E6: @@ -1521,7 +1521,7 @@ _021D41E6: ldrb r4, [r0] cmp r4, #0 bne _021D41FC - bl sub_02022974 + bl GF_AssertFail _021D41FC: cmp r4, #0 bne _021D4202 @@ -1552,7 +1552,7 @@ ov5_021D4220: ; 0x021D4220 add r6, r3, #0 cmp r4, #6 blo _021D4232 - bl sub_02022974 + bl GF_AssertFail _021D4232: add r0, r5, #0 add r1, r7, #0 @@ -1563,7 +1563,7 @@ _021D4232: ldr r0, [r5, r4] cmp r0, #0 beq _021D424A - bl sub_02022974 + bl GF_AssertFail _021D424A: str r6, [r5, r4] pop {r3, r4, r5, r6, r7, pc} @@ -1578,7 +1578,7 @@ ov5_021D4250: ; 0x021D4250 add r6, r2, #0 cmp r4, #0 bne _021D4260 - bl sub_02022974 + bl GF_AssertFail _021D4260: add r0, r5, #0 add r1, r4, #0 @@ -1600,7 +1600,7 @@ ov5_021D4278: ; 0x021D4278 add r4, r3, #0 cmp r5, #0 bne _021D428A - bl sub_02022974 + bl GF_AssertFail _021D428A: add r0, r6, #0 add r1, r5, #0 @@ -1627,7 +1627,7 @@ ov5_021D42B0: ; 0x021D42B0 add r4, r1, #0 add r6, r2, #0 bne _021D42BE - bl sub_02022974 + bl GF_AssertFail _021D42BE: add r0, r4, #0 add r1, r6, #0 @@ -1647,7 +1647,7 @@ ov5_021D42D8: ; 0x021D42D8 add r5, r0, #0 add r4, r1, #0 bne _021D42E4 - bl sub_02022974 + bl GF_AssertFail _021D42E4: add r0, r5, #0 add r1, r4, #0 @@ -1662,7 +1662,7 @@ ov5_021D42F0: ; 0x021D42F0 bl ov5_021D42D8 add r4, r0, #0 bne _021D42FE - bl sub_02022974 + bl GF_AssertFail _021D42FE: add r0, r4, #0 bl ov5_021D3F70 diff --git a/asm/ov5_021D431C.s b/asm/ov5_021D431C.s index adf8b749e9..a908a3c30f 100644 --- a/asm/ov5_021D431C.s +++ b/asm/ov5_021D431C.s @@ -121,7 +121,7 @@ _021D436A: bl ov5_021D41C8 b _021D43F6 _021D43EC: - bl sub_02022974 + bl GF_AssertFail add sp, #0x84 mov r0, #1 pop {r4, r5, r6, r7, pc} @@ -169,7 +169,7 @@ _021D443E: mov r2, #0 b _021D444C _021D4446: - bl sub_02022974 + bl GF_AssertFail mov r2, #0 _021D444C: ldr r0, [r6, #0x54] @@ -241,7 +241,7 @@ _021D44D4: mov r2, #1 b _021D44E2 _021D44DC: - bl sub_02022974 + bl GF_AssertFail mov r2, #1 _021D44E2: ldr r0, [r6, #0x54] @@ -373,7 +373,7 @@ _021D456C: bl ov5_021D41C8 b _021D4600 _021D45EC: - bl sub_02022974 + bl GF_AssertFail mov r0, #1 bl ov5_021D1744 mov r0, #6 @@ -444,7 +444,7 @@ _021D4670: mov r2, #2 b _021D467E _021D4678: - bl sub_02022974 + bl GF_AssertFail mov r2, #0 _021D467E: ldr r0, [r6, #0x54] @@ -517,7 +517,7 @@ _021D470A: mov r2, #3 b _021D4718 _021D4712: - bl sub_02022974 + bl GF_AssertFail mov r2, #1 _021D4718: ldr r0, [r6, #0x54] @@ -785,7 +785,7 @@ _021D48C4: bl ov5_021D41C8 b _021D491C _021D4912: - bl sub_02022974 + bl GF_AssertFail add sp, #0x40 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -801,7 +801,7 @@ _021D491C: bl sub_02065638 b _021D493A _021D4936: - bl sub_02022974 + bl GF_AssertFail _021D493A: ldr r0, [r4, #0] add r0, r0, #1 @@ -832,7 +832,7 @@ _021D496E: bl sub_02065638 b _021D497A _021D4976: - bl sub_02022974 + bl GF_AssertFail _021D497A: ldr r0, [r4, #0] add r0, r0, #1 @@ -1007,7 +1007,7 @@ _021D4A8E: bl ov5_021D41C8 b _021D4AE8 _021D4ADE: - bl sub_02022974 + bl GF_AssertFail add sp, #0x40 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -1023,7 +1023,7 @@ _021D4AE8: bl sub_02065638 b _021D4B06 _021D4B02: - bl sub_02022974 + bl GF_AssertFail _021D4B06: ldr r0, [r4, #0] add r0, r0, #1 @@ -1052,7 +1052,7 @@ _021D4B34: bl sub_02065638 b _021D4B40 _021D4B3C: - bl sub_02022974 + bl GF_AssertFail _021D4B40: ldr r0, [r4, #0] add r0, r0, #1 @@ -1203,7 +1203,7 @@ _021D4C04: add sp, #0x84 pop {r4, r5, r6, r7, pc} _021D4C7C: - bl sub_02022974 + bl GF_AssertFail add sp, #0x84 pop {r4, r5, r6, r7, pc} ; .align 2, 0 @@ -1248,7 +1248,7 @@ _021D4CC6: mov r2, #0 b _021D4CD4 _021D4CCE: - bl sub_02022974 + bl GF_AssertFail mov r2, #0 _021D4CD4: ldr r0, [r5, #0x54] @@ -1300,7 +1300,7 @@ _021D4D2A: mov r2, #1 b _021D4D38 _021D4D32: - bl sub_02022974 + bl GF_AssertFail mov r2, #1 _021D4D38: ldr r0, [r5, #0x54] @@ -1373,7 +1373,7 @@ ov5_021D4D78: ; 0x021D4D78 bl sub_02055208 cmp r0, #0 bne _021D4DBA - bl sub_02022974 + bl GF_AssertFail _021D4DBA: ldr r0, [sp, #0x18] bl ov5_021E18BC @@ -1386,7 +1386,7 @@ _021D4DBA: bl ov5_021D3B24 cmp r0, #0 bne _021D4DD8 - bl sub_02022974 + bl GF_AssertFail _021D4DD8: ldr r0, [sp, #0x14] ldr r2, [r4, #0x50] @@ -1751,7 +1751,7 @@ _021D50B6: mov r6, #0x27 b _021D50BE _021D50BA: - bl sub_02022974 + bl GF_AssertFail _021D50BE: mov r1, #0 str r1, [sp] diff --git a/asm/ov5_021D521C.s b/asm/ov5_021D521C.s index 374115ae09..263fdd1ed3 100644 --- a/asm/ov5_021D521C.s +++ b/asm/ov5_021D521C.s @@ -13,7 +13,7 @@ ov5_021D521C: ; 0x021D521C add r5, r0, #0 cmp r6, #4 blo _021D522A - bl sub_02022974 + bl GF_AssertFail _021D522A: mov r0, #4 mov r1, #0x14 @@ -60,7 +60,7 @@ ov5_021D5278: ; 0x021D5278 push {r4, lr} add r4, r0, #0 bne _021D5282 - bl sub_02022974 + bl GF_AssertFail _021D5282: ldr r0, [r4, #0] add r0, r0, #4 @@ -78,7 +78,7 @@ ov5_021D5298: ; 0x021D5298 push {r3, r4, r5, lr} add r4, r0, #0 bne _021D52A2 - bl sub_02022974 + bl GF_AssertFail _021D52A2: bl sub_020138C8 lsr r1, r0, #0x1f diff --git a/asm/ov5_021D56BC.s b/asm/ov5_021D56BC.s index ac0fbffbac..703424a39b 100644 --- a/asm/ov5_021D56BC.s +++ b/asm/ov5_021D56BC.s @@ -14,7 +14,7 @@ ov5_021D56BC: ; 0x021D56BC bl sub_02018144 add r4, r0, #0 bne _021D56CE - bl sub_02022974 + bl GF_AssertFail _021D56CE: add r0, r4, #0 pop {r4, pc} @@ -41,7 +41,7 @@ ov5_021D56D4: ; 0x021D56D4 bl FS_ReadFile cmp r0, #0 bge _021D5702 - bl sub_02022974 + bl GF_AssertFail _021D5702: add r0, sp, #4 add r1, sp, #0 @@ -49,7 +49,7 @@ _021D5702: bl FS_ReadFile cmp r0, #0 bge _021D5714 - bl sub_02022974 + bl GF_AssertFail _021D5714: add r0, sp, #0 ldrh r1, [r0, #2] @@ -62,7 +62,7 @@ _021D5714: str r0, [r5, #0] cmp r0, #0 bne _021D5730 - bl sub_02022974 + bl GF_AssertFail _021D5730: mov r0, #4 add r1, r4, #0 @@ -70,7 +70,7 @@ _021D5730: str r0, [r5, #4] cmp r0, #0 bne _021D5742 - bl sub_02022974 + bl GF_AssertFail _021D5742: ldr r1, [r5, #0] add r0, sp, #4 @@ -78,7 +78,7 @@ _021D5742: bl FS_ReadFile cmp r0, #0 bge _021D5754 - bl sub_02022974 + bl GF_AssertFail _021D5754: ldr r1, [r5, #4] add r0, sp, #4 @@ -86,14 +86,14 @@ _021D5754: bl FS_ReadFile cmp r0, #0 bge _021D5766 - bl sub_02022974 + bl GF_AssertFail _021D5766: add r0, sp, #4 bl FS_CloseFile add sp, #0x4c pop {r3, r4, r5, r6, pc} _021D5770: - bl sub_02022974 + bl GF_AssertFail add sp, #0x4c pop {r3, r4, r5, r6, pc} thumb_func_end ov5_021D56D4 diff --git a/asm/ov5_021D5B40.s b/asm/ov5_021D5B40.s index 2463b97d42..e58e638260 100644 --- a/asm/ov5_021D5B40.s +++ b/asm/ov5_021D5B40.s @@ -19,7 +19,7 @@ ov5_021D5B40: ; 0x021D5B40 add r4, r1, r0 cmp r2, #0x11 blo _021D5B5A - bl sub_02022974 + bl GF_AssertFail _021D5B5A: mov r0, #4 bl sub_020203AC diff --git a/asm/ov5_021D5BC0.s b/asm/ov5_021D5BC0.s index 57c2733b45..04edbb9e73 100644 --- a/asm/ov5_021D5BC0.s +++ b/asm/ov5_021D5BC0.s @@ -12,11 +12,11 @@ ov5_021D5BC0: ; 0x021D5BC0 ldr r4, [r0, #0x18] cmp r4, #0 bne _021D5BCC - bl sub_02022974 + bl GF_AssertFail _021D5BCC: cmp r4, #5 blt _021D5BD4 - bl sub_02022974 + bl GF_AssertFail _021D5BD4: sub r0, r4, #1 pop {r4, pc} diff --git a/asm/ov5_021D5CB0.s b/asm/ov5_021D5CB0.s index 82ebbbc909..41305adbf1 100644 --- a/asm/ov5_021D5CB0.s +++ b/asm/ov5_021D5CB0.s @@ -15,7 +15,7 @@ ov5_021D5CB0: ; 0x021D5CB0 bl sub_02018144 add r4, r0, #0 bne _021D5CC4 - bl sub_02022974 + bl GF_AssertFail _021D5CC4: mov r1, #0 add r2, r4, #0 diff --git a/asm/ov5_021D5EB8.s b/asm/ov5_021D5EB8.s index dda9e8c3a1..cc00331154 100644 --- a/asm/ov5_021D5EB8.s +++ b/asm/ov5_021D5EB8.s @@ -73,11 +73,11 @@ ov5_021D5F24: ; 0x021D5F24 add r4, r1, #0 cmp r0, #6 beq _021D5F34 - bl sub_02022974 + bl GF_AssertFail _021D5F34: cmp r4, #0x1f blt _021D5F3C - bl sub_02022974 + bl GF_AssertFail _021D5F3C: ldr r2, [r5, #4] cmp r2, r4 @@ -87,7 +87,7 @@ _021D5F3C: bl ov5_021D6418 cmp r0, #0 bne _021D5F52 - bl sub_02022974 + bl GF_AssertFail _021D5F52: ldr r0, [r5, #0] mov r1, #0 @@ -95,7 +95,7 @@ _021D5F52: bl ov5_021D6418 cmp r0, #0 bne _021D5F64 - bl sub_02022974 + bl GF_AssertFail _021D5F64: ldr r0, [r5, #0] mov r1, #3 @@ -103,7 +103,7 @@ _021D5F64: bl ov5_021D6418 cmp r0, #0 bne _021D5F76 - bl sub_02022974 + bl GF_AssertFail _021D5F76: str r4, [r5, #4] _021D5F78: @@ -118,7 +118,7 @@ ov5_021D5F7C: ; 0x021D5F7C add r5, r0, #0 cmp r4, #0x1f blt _021D5F8A - bl sub_02022974 + bl GF_AssertFail _021D5F8A: ldr r0, [r5, #0xc] cmp r0, #6 @@ -136,7 +136,7 @@ _021D5FA0: ldr r0, [r5, #0x14] cmp r0, #0 beq _021D5FAA - bl sub_02022974 + bl GF_AssertFail _021D5FAA: str r4, [r5, #8] ldr r0, [r5, #4] @@ -198,7 +198,7 @@ _021D6006: bl ov5_021D6418 cmp r0, #0 bne _021D6018 - bl sub_02022974 + bl GF_AssertFail _021D6018: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -216,7 +216,7 @@ _021D6020: bl ov5_021D6418 cmp r0, #0 bne _021D603E - bl sub_02022974 + bl GF_AssertFail _021D603E: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -229,7 +229,7 @@ _021D6046: bl ov5_021D6418 cmp r0, #0 bne _021D6058 - bl sub_02022974 + bl GF_AssertFail _021D6058: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -252,7 +252,7 @@ _021D6074: bl ov5_021D6418 cmp r0, #0 bne _021D6086 - bl sub_02022974 + bl GF_AssertFail _021D6086: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -305,7 +305,7 @@ _021D60D4: bl ov5_021D6418 cmp r0, #0 bne _021D60E6 - bl sub_02022974 + bl GF_AssertFail _021D60E6: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -328,7 +328,7 @@ _021D6102: bl ov5_021D6418 cmp r0, #0 bne _021D6114 - bl sub_02022974 + bl GF_AssertFail _021D6114: ldr r0, [r4, #0] ldr r2, [r4, #8] @@ -336,7 +336,7 @@ _021D6114: bl ov5_021D6418 cmp r0, #0 bne _021D6126 - bl sub_02022974 + bl GF_AssertFail _021D6126: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -354,7 +354,7 @@ _021D612E: bl ov5_021D6418 cmp r0, #0 bne _021D614C - bl sub_02022974 + bl GF_AssertFail _021D614C: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -1631,7 +1631,7 @@ _021D6AB2: bl ov5_021D6BC4 cmp r0, #0 bne _021D6AC0 - bl sub_02022974 + bl GF_AssertFail _021D6AC0: ldrh r0, [r4, #0x12] add r0, r0, #1 @@ -1985,7 +1985,7 @@ _021D6D3E: ldr r0, [r5, #0x4c] cmp r0, #0 bne _021D6D58 - bl sub_02022974 + bl GF_AssertFail _021D6D58: add r4, r4, #1 add r5, #0x3c @@ -2121,7 +2121,7 @@ ov5_021D6E20: ; 0x021D6E20 str r0, [sp, #0x14] cmp r0, #0 bne _021D6E56 - bl sub_02022974 + bl GF_AssertFail _021D6E56: ldr r0, [sp, #0x14] add r1, sp, #0x18 @@ -2185,15 +2185,15 @@ ov5_021D6EC8: ; 0x021D6EC8 add r4, r1, #0 cmp r0, #0 beq _021D6ED8 - bl sub_02022974 + bl GF_AssertFail _021D6ED8: cmp r4, #0 bgt _021D6EE0 - bl sub_02022974 + bl GF_AssertFail _021D6EE0: cmp r4, #0x28 bls _021D6EE8 - bl sub_02022974 + bl GF_AssertFail _021D6EE8: add r0, r5, #0 add r0, #0xc @@ -2245,7 +2245,7 @@ _021D6F36: ldr r0, [r4, #4] cmp r0, #0 bne _021D6F40 - bl sub_02022974 + bl GF_AssertFail _021D6F40: ldr r0, [r4, #4] mov r1, #1 @@ -11202,7 +11202,7 @@ ov5_021DB4B8: ; 0x021DB4B8 ldr r0, [r5, r0] cmp r0, #0 beq _021DB4CA - bl sub_02022974 + bl GF_AssertFail _021DB4CA: ldr r1, _021DB4E0 ; =0x00000B9C mov r0, #1 diff --git a/asm/ov5_021DB888.s b/asm/ov5_021DB888.s index b44bbf294e..454b39913d 100644 --- a/asm/ov5_021DB888.s +++ b/asm/ov5_021DB888.s @@ -20,7 +20,7 @@ ov5_021DB888: ; 0x021DB888 bl sub_02018144 add r4, r0, #0 bne _021DB8AA - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _021DB8AA: mov r2, #0x12 @@ -524,7 +524,7 @@ ov5_021DBC64: ; 0x021DBC64 bl sub_02018144 add r4, r0, #0 bne _021DBC7C - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} _021DBC7C: ldr r0, _021DBC90 ; =ov5_021DBC94 @@ -552,7 +552,7 @@ ov5_021DBC94: ; 0x021DBC94 ldrh r0, [r1, r0] cmp r0, #0 bne _021DBCB0 - bl sub_02022974 + bl GF_AssertFail _021DBCB0: ldr r2, [r4, #8] ldr r0, _021DBCD0 ; =0x00000112 diff --git a/asm/ov5_021DD6FC.s b/asm/ov5_021DD6FC.s index 5853ac9c98..25991c311b 100644 --- a/asm/ov5_021DD6FC.s +++ b/asm/ov5_021DD6FC.s @@ -472,7 +472,7 @@ _021DDA64: strb r5, [r4] pop {r3, r4, r5, pc} _021DDA6E: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} ; .align 2, 0 _021DDA74: .word ov5_021DD8A4 diff --git a/asm/ov5_021DDBE8.s b/asm/ov5_021DDBE8.s index a0dd1a0b0c..7f377437c5 100644 --- a/asm/ov5_021DDBE8.s +++ b/asm/ov5_021DDBE8.s @@ -535,7 +535,7 @@ ov5_021DDF9C: ; 0x021DDF9C ldr r4, [sp, #0x20] cmp r0, #0 beq _021DDFB4 - bl sub_02022974 + bl GF_AssertFail _021DDFB4: mov r0, #0 str r0, [r6, #0x18] @@ -629,7 +629,7 @@ ov5_021DE058: ; 0x021DE058 bl ov5_021DDD7C cmp r0, #0 beq _021DE06E - bl sub_02022974 + bl GF_AssertFail _021DE06E: str r4, [r5, #0x18] mov r0, #0 @@ -885,7 +885,7 @@ ov5_021DE240: ; 0x021DE240 add r7, r3, #0 cmp r0, #0 beq _021DE254 - bl sub_02022974 + bl GF_AssertFail _021DE254: mov r1, #0 str r1, [r5, #0x18] @@ -1404,7 +1404,7 @@ ov5_021DE62C: ; 0x021DE62C bl sub_02021B90 add r4, r0, #0 bne _021DE65A - bl sub_02022974 + bl GF_AssertFail _021DE65A: add r0, r4, #0 add sp, #0x20 @@ -1482,7 +1482,7 @@ ov5_021DE6C4: ; 0x021DE6C4 add r7, r3, #0 cmp r0, #0 beq _021DE6DA - bl sub_02022974 + bl GF_AssertFail _021DE6DA: ldr r3, [sp, #0x1c] add r0, r5, #0 @@ -1604,7 +1604,7 @@ ov5_021DE7A4: ; 0x021DE7A4 add r7, r3, #0 cmp r0, #0 beq _021DE7BA - bl sub_02022974 + bl GF_AssertFail _021DE7BA: ldr r3, [sp, #0x1c] add r0, r5, #0 @@ -2363,7 +2363,7 @@ ov5_021DED20: ; 0x021DED20 add r5, r3, #0 cmp r0, #0 beq _021DED3C - bl sub_02022974 + bl GF_AssertFail _021DED3C: mov r2, #0 str r2, [r4, #0x18] @@ -2589,7 +2589,7 @@ _021DEEE2: mov r6, #0 b _021DEEEC _021DEEE6: - bl sub_02022974 + bl GF_AssertFail mov r6, #0 _021DEEEC: ldr r0, [r5, #4] @@ -2699,7 +2699,7 @@ ov5_021DEFA0: ; 0x021DEFA0 ldr r0, [r0, #0] cmp r0, #0 beq _021DEFB0 - bl sub_02022974 + bl GF_AssertFail _021DEFB0: mov r0, #4 mov r1, #0x18 @@ -2766,7 +2766,7 @@ ov5_021DF038: ; 0x021DF038 ldr r0, [r0, #0] cmp r0, #0 bne _021DF046 - bl sub_02022974 + bl GF_AssertFail _021DF046: ldr r0, _021DF050 ; =0x02202120 mov r1, #1 @@ -2784,7 +2784,7 @@ ov5_021DF054: ; 0x021DF054 ldr r0, [r0, #0] cmp r0, #0 bne _021DF062 - bl sub_02022974 + bl GF_AssertFail _021DF062: ldr r0, _021DF06C ; =0x02202120 ldr r0, [r0, #0] @@ -2815,7 +2815,7 @@ ov5_021DF084: ; 0x021DF084 ldr r0, [r0, #0] cmp r0, #0 bne _021DF092 - bl sub_02022974 + bl GF_AssertFail _021DF092: bl sub_020141E4 ldr r0, _021DF0C8 ; =0x02202120 @@ -2853,14 +2853,14 @@ ov5_021DF0CC: ; 0x021DF0CC ldr r0, [r0, #0] cmp r0, #0 bne _021DF0E0 - bl sub_02022974 + bl GF_AssertFail _021DF0E0: ldr r0, _021DF170 ; =0x02202120 ldr r0, [r0, #0] ldr r0, [r0, #8] cmp r0, #0 beq _021DF0EE - bl sub_02022974 + bl GF_AssertFail _021DF0EE: mov r1, #0x12 mov r0, #4 @@ -2887,7 +2887,7 @@ _021DF0EE: ldr r0, [r0, #8] cmp r0, #0 bne _021DF128 - bl sub_02022974 + bl GF_AssertFail _021DF128: ldr r0, _021DF170 ; =0x02202120 mov r1, #1 @@ -2939,14 +2939,14 @@ ov5_021DF17C: ; 0x021DF17C ldr r0, [r0, #0] cmp r0, #0 bne _021DF198 - bl sub_02022974 + bl GF_AssertFail _021DF198: ldr r0, _021DF1C8 ; =0x02202120 ldr r0, [r0, #0] ldr r0, [r0, #8] cmp r0, #0 bne _021DF1A6 - bl sub_02022974 + bl GF_AssertFail _021DF1A6: mov r4, #0 cmp r5, #0 @@ -2976,7 +2976,7 @@ ov5_021DF1CC: ; 0x021DF1CC ldr r0, [r0, #0] cmp r0, #0 bne _021DF1DA - bl sub_02022974 + bl GF_AssertFail _021DF1DA: ldr r0, _021DF204 ; =0x02202120 ldr r0, [r0, #0] @@ -3027,7 +3027,7 @@ ov5_021DF224: ; 0x021DF224 ldr r0, [r0, #0] cmp r0, #0 bne _021DF232 - bl sub_02022974 + bl GF_AssertFail _021DF232: ldr r0, _021DF254 ; =0x02202120 ldr r0, [r0, #0] @@ -3245,11 +3245,11 @@ ov5_021DF3E8: ; 0x021DF3E8 ldr r0, [r0, #0] cmp r0, #0 bne _021DF3FA - bl sub_02022974 + bl GF_AssertFail _021DF3FA: cmp r4, #0 beq _021DF402 - bl sub_02022974 + bl GF_AssertFail _021DF402: ldr r0, _021DF410 ; =0x02202120 ldr r2, [r0, #0] @@ -3270,11 +3270,11 @@ ov5_021DF414: ; 0x021DF414 ldr r0, [r0, #0] cmp r0, #0 bne _021DF426 - bl sub_02022974 + bl GF_AssertFail _021DF426: cmp r4, #0 beq _021DF42E - bl sub_02022974 + bl GF_AssertFail _021DF42E: ldr r0, _021DF43C ; =0x02202120 ldr r2, [r0, #0] diff --git a/asm/ov5_021DF440.s b/asm/ov5_021DF440.s index e3ab891e63..ed625e2584 100644 --- a/asm/ov5_021DF440.s +++ b/asm/ov5_021DF440.s @@ -71,7 +71,7 @@ ov5_021DF4A8: ; 0x021DF4A8 bl ov5_021DF694 cmp r0, #0 beq _021DF4BC - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} _021DF4BC: add r0, r5, #0 @@ -181,7 +181,7 @@ ov5_021DF55C: ; 0x021DF55C bl ov5_021DF694 cmp r0, #0 bne _021DF56E - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} _021DF56E: @@ -369,7 +369,7 @@ _021DF684: sub r4, r4, #1 bne _021DF676 _021DF68A: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} ; .align 2, 0 @@ -443,7 +443,7 @@ _021DF6E2: cmp r2, #0x22 bne _021DF6DA _021DF6EA: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} nop @@ -499,7 +499,7 @@ ov5_021DF72C: ; 0x021DF72C bl sub_02071330 add r4, r0, #0 bne _021DF746 - bl sub_02022974 + bl GF_AssertFail _021DF746: add r0, r4, #0 add sp, #8 @@ -615,7 +615,7 @@ ov5_021DF7F8: ; 0x021DF7F8 bl sub_0202119C add r4, r0, #0 bne _021DF828 - bl sub_02022974 + bl GF_AssertFail _021DF828: cmp r4, #0 beq _021DF842 @@ -669,7 +669,7 @@ ov5_021DF864: ; 0x021DF864 bl sub_02022D98 add r4, r0, #0 bne _021DF896 - bl sub_02022974 + bl GF_AssertFail _021DF896: add r0, r4, #0 bl sub_02022DF4 @@ -689,7 +689,7 @@ _021DF8A4: bl ov5_021DF930 add r4, r0, #0 bne _021DF8C0 - bl sub_02022974 + bl GF_AssertFail _021DF8C0: add r0, r4, #0 add sp, #0x1c @@ -754,7 +754,7 @@ _021DF922: add r3, #8 sub r2, r2, #1 bne _021DF916 - bl sub_02022974 + bl GF_AssertFail pop {r3, pc} ; .align 2, 0 thumb_func_end ov5_021DF910 @@ -797,7 +797,7 @@ _021DF964: _021DF96A: cmp r4, #0 bne _021DF972 - bl sub_02022974 + bl GF_AssertFail _021DF972: add r0, r4, #0 mov r1, #0 @@ -846,7 +846,7 @@ _021DF9C4: add r3, #8 sub r2, r2, #1 bne _021DF9BA - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -947,7 +947,7 @@ ov5_021DFA3C: ; 0x021DFA3C bl sub_02022C9C cmp r0, #0 bne _021DFA6E - bl sub_02022974 + bl GF_AssertFail _021DFA6E: ldr r2, [r4, #0x18] add r0, r5, #0 diff --git a/asm/ov5_021DFB54.s b/asm/ov5_021DFB54.s index 43fe45f97d..b2bee37d82 100644 --- a/asm/ov5_021DFB54.s +++ b/asm/ov5_021DFB54.s @@ -336,13 +336,13 @@ ov5_021DFDE0: ; 0x021DFDE0 add r7, r3, #0 cmp r5, #0 bne _021DFDF2 - bl sub_02022974 + bl GF_AssertFail _021DFDF2: add r0, r5, #0 bl sub_0205EB3C cmp r0, #0 bne _021DFE00 - bl sub_02022974 + bl GF_AssertFail _021DFE00: add r0, r5, #0 bl sub_0205EF58 @@ -1984,13 +1984,13 @@ ov5_021E0A68: ; 0x021E0A68 ldr r0, [r5, #0x30] cmp r1, r0 bgt _021E0ACE - bl sub_02022974 + bl GF_AssertFail _021E0ACE: ldr r1, [sp, #0x10] ldr r0, [r5, #0x2c] cmp r1, r0 blt _021E0ADA - bl sub_02022974 + bl GF_AssertFail _021E0ADA: mov r0, #0 str r0, [sp] @@ -2108,13 +2108,13 @@ _021E0BAA: ldr r0, [r4, #0x30] cmp r1, r0 beq _021E0BB6 - bl sub_02022974 + bl GF_AssertFail _021E0BB6: ldr r1, [sp, #4] ldr r0, [r4, #0x2c] cmp r1, r0 beq _021E0BC2 - bl sub_02022974 + bl GF_AssertFail _021E0BC2: ldr r0, [r4, #0x3c] ldr r1, [r4, #0xc] @@ -2222,13 +2222,13 @@ ov5_021E0C34: ; 0x021E0C34 ldr r0, [r5, #0x30] cmp r1, r0 blt _021E0C9E - bl sub_02022974 + bl GF_AssertFail _021E0C9E: ldr r1, [sp, #0x10] ldr r0, [r5, #0x2c] cmp r1, r0 bgt _021E0CAA - bl sub_02022974 + bl GF_AssertFail _021E0CAA: mov r0, #0 str r0, [sp] @@ -2359,13 +2359,13 @@ _021E0D90: ldr r0, [r4, #0x30] cmp r1, r0 beq _021E0D9C - bl sub_02022974 + bl GF_AssertFail _021E0D9C: ldr r1, [sp, #4] ldr r0, [r4, #0x2c] cmp r1, r0 beq _021E0DA8 - bl sub_02022974 + bl GF_AssertFail _021E0DA8: ldr r0, [r4, #0x3c] ldr r1, [r4, #0xc] @@ -2609,7 +2609,7 @@ _021E0F6E: bl sub_0200D9E8 add r4, r0, #0 bne _021E0FB0 - bl sub_02022974 + bl GF_AssertFail _021E0FB0: add r0, r4, #0 add sp, #8 @@ -2817,7 +2817,7 @@ ov5_021E1110: ; 0x021E1110 bl sub_02018184 add r4, r0, #0 bne _021E1124 - bl sub_02022974 + bl GF_AssertFail _021E1124: add r0, r4, #0 mov r1, #0 diff --git a/asm/ov5_021E1154.s b/asm/ov5_021E1154.s index ec8c027436..232672fa53 100644 --- a/asm/ov5_021E1154.s +++ b/asm/ov5_021E1154.s @@ -258,7 +258,7 @@ ov5_021E132C: ; 0x021E132C bl sub_02018184 add r4, r0, #0 bne _021E1340 - bl sub_02022974 + bl GF_AssertFail _021E1340: add r0, r4, #0 mov r1, #0 diff --git a/asm/ov5_021E15F4.s b/asm/ov5_021E15F4.s index 3adfe94808..36f1e57011 100644 --- a/asm/ov5_021E15F4.s +++ b/asm/ov5_021E15F4.s @@ -89,7 +89,7 @@ ov5_021E1674: ; 0x021E1674 add r4, r1, #0 cmp r5, #0x20 blt _021E1684 - bl sub_02022974 + bl GF_AssertFail _021E1684: add r6, sp, #0 mov r3, #0 @@ -445,7 +445,7 @@ ov5_021E18E0: ; 0x021E18E0 add r5, r0, #0 cmp r4, #0x20 blt _021E18EE - bl sub_02022974 + bl GF_AssertFail _021E18EE: mov r0, #0x8c mul r0, r4 @@ -453,7 +453,7 @@ _021E18EE: ldr r0, [r4, #4] cmp r0, #0 bne _021E18FE - bl sub_02022974 + bl GF_AssertFail _021E18FE: add r0, r4, #0 pop {r3, r4, r5, pc} @@ -641,7 +641,7 @@ _021E1A54: lsr r4, r1, #0x18 cmp r4, #0x20 blo _021E19E4 - bl sub_02022974 + bl GF_AssertFail mov r0, #0x20 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} diff --git a/asm/ov5_021E1D20.s b/asm/ov5_021E1D20.s index 34217ab083..2e32775500 100644 --- a/asm/ov5_021E1D20.s +++ b/asm/ov5_021E1D20.s @@ -424,7 +424,7 @@ ov5_021E2064: ; 0x021E2064 push {r4, lr} add r4, r0, #0 bne _021E2070 - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} _021E2070: ldr r0, [r4, #0x1c] diff --git a/asm/ov5_021E779C.s b/asm/ov5_021E779C.s index 14dc247625..6d0eb4d23f 100644 --- a/asm/ov5_021E779C.s +++ b/asm/ov5_021E779C.s @@ -152,13 +152,13 @@ _021E7890: add r0, r3, #0 cmp r1, r0 bge _021E789A - bl sub_02022974 + bl GF_AssertFail _021E789A: ldr r1, [sp, #0x28] ldr r0, [sp, #8] cmp r0, r1 bge _021E78A6 - bl sub_02022974 + bl GF_AssertFail _021E78A6: ldr r1, [sp, #4] ldr r0, [sp, #0xc] @@ -293,7 +293,7 @@ _021E798E: str r0, [r4, #0] pop {r3, r4, r5, r6, r7, pc} _021E79A0: - bl sub_02022974 + bl GF_AssertFail _021E79A4: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -581,7 +581,7 @@ ov5_021E7BAC: ; 0x021E7BAC bl sub_02006DC8 b _021E7BE8 _021E7BD2: - bl sub_02022974 + bl GF_AssertFail mov r0, #0x10 str r0, [sp] mov r0, #0x43 @@ -1226,7 +1226,7 @@ ov5_021E80D0: ; 0x021E80D0 ldr r0, [r0, r5] cmp r0, #0 beq _021E80F8 - bl sub_02022974 + bl GF_AssertFail _021E80F8: ldr r0, [sp, #4] mov r1, #1 @@ -1334,7 +1334,7 @@ ov5_021E8188: ; 0x021E8188 ldr r0, [r0, #0] cmp r1, r0 ble _021E81C6 - bl sub_02022974 + bl GF_AssertFail _021E81C6: ldr r0, [r4, #0x10] ldr r1, [r0, #0] @@ -1390,7 +1390,7 @@ _021E8222: ror r1, r0 add r0, r2, r1 beq _021E8236 - bl sub_02022974 + bl GF_AssertFail _021E8236: mov r0, #0 str r0, [r4, #0x18] @@ -1407,7 +1407,7 @@ _021E8240: ldr r0, [r2, #8] cmp r1, r0 beq _021E8258 - bl sub_02022974 + bl GF_AssertFail b _021E8320 _021E8258: cmp r3, r7 @@ -1458,7 +1458,7 @@ _021E82A2: ror r1, r0 add r0, r2, r1 beq _021E8318 - bl sub_02022974 + bl GF_AssertFail b _021E8318 _021E82B8: add r1, r5, #0 @@ -1510,7 +1510,7 @@ _021E8304: ror r1, r0 add r0, r2, r1 beq _021E8318 - bl sub_02022974 + bl GF_AssertFail _021E8318: ldrb r0, [r4, #0x1c] add r1, r5, #0 @@ -1824,7 +1824,7 @@ ov5_021E8558: ; 0x021E8558 ldr r6, [sp, #0x30] cmp r0, #1 bne _021E8572 - bl sub_02022974 + bl GF_AssertFail _021E8572: add r0, r6, #0 add r1, r4, #0 @@ -1901,7 +1901,7 @@ _021E85F0: bl ov5_021E80D0 cmp r0, #1 beq _021E8610 - bl sub_02022974 + bl GF_AssertFail _021E8610: add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} @@ -2069,7 +2069,7 @@ _021E8732: mvn r4, r4 b _021E8748 _021E8744: - bl sub_02022974 + bl GF_AssertFail _021E8748: ldr r2, [sp, #0x10] ldr r3, [sp, #0xc] @@ -2177,7 +2177,7 @@ _021E8810: mvn r4, r4 b _021E881A _021E8816: - bl sub_02022974 + bl GF_AssertFail _021E881A: ldr r2, [sp, #0x10] ldr r3, [sp, #0xc] @@ -2381,7 +2381,7 @@ _021E899E: mvn r4, r4 b _021E89A8 _021E89A4: - bl sub_02022974 + bl GF_AssertFail _021E89A8: ldr r2, [sp, #0x10] ldr r3, [sp, #0xc] @@ -2398,7 +2398,7 @@ _021E89A8: add sp, #0x14 pop {r4, r5, r6, r7, pc} _021E89C6: - bl sub_02022974 + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} ; .align 2, 0 @@ -2579,7 +2579,7 @@ _021E8B0A: mov r0, #0 pop {r3, pc} _021E8B12: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -2641,7 +2641,7 @@ _021E8B74: add r0, r4, #0 pop {r3, r4, r5, pc} _021E8B7C: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 _021E8B82: pop {r3, r4, r5, pc} @@ -2712,7 +2712,7 @@ _021E8BDE: lsr r6, r0, #0x18 b _021E8C1E _021E8BEC: - bl sub_02022974 + bl GF_AssertFail b _021E8C1E _021E8BF2: cmp r5, r0 @@ -2734,10 +2734,10 @@ _021E8C06: lsr r6, r0, #0x18 b _021E8C1E _021E8C14: - bl sub_02022974 + bl GF_AssertFail b _021E8C1E _021E8C1A: - bl sub_02022974 + bl GF_AssertFail _021E8C1E: strb r6, [r4] pop {r4, r5, r6, pc} @@ -2774,7 +2774,7 @@ _021E8C4C: mov r0, #1 pop {r3, pc} _021E8C50: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} thumb_func_end ov5_021E8C24 @@ -2824,7 +2824,7 @@ ov5_021E8C8C: ; 0x021E8C8C add r4, #0x64 cmp r0, #0 beq _021E8CA8 - bl sub_02022974 + bl GF_AssertFail _021E8CA8: add r1, r5, #0 add r1, #0xa1 @@ -2922,13 +2922,13 @@ ov5_021E8D50: ; 0x021E8D50 add r4, #0x64 cmp r0, #2 blo _021E8D64 - bl sub_02022974 + bl GF_AssertFail _021E8D64: add r0, r5, #0 bl ov5_021E8C8C cmp r0, #1 beq _021E8D72 - bl sub_02022974 + bl GF_AssertFail _021E8D72: mov r0, #0x86 ldr r2, [r4, #0x10] @@ -3385,7 +3385,7 @@ _021E90B6: mov r7, #0 b _021E90CA _021E90C6: - bl sub_02022974 + bl GF_AssertFail _021E90CA: add r0, r7, #0 bl ov5_021EEAC8 @@ -3794,7 +3794,7 @@ _021E93A6: mvn r0, r0 cmp r5, r0 bne _021E93B2 - bl sub_02022974 + bl GF_AssertFail _021E93B2: add r0, r4, #0 add r0, #0xac @@ -4031,7 +4031,7 @@ ov5_021E9560: ; 0x021E9560 add r4, r0, #0 cmp r5, #4 blo _021E956E - bl sub_02022974 + bl GF_AssertFail _021E956E: lsl r0, r5, #2 add r0, r4, r0 @@ -4092,7 +4092,7 @@ _021E95CA: mul r0, r1 cmp r7, r0 blo _021E95E0 - bl sub_02022974 + bl GF_AssertFail _021E95E0: add r0, r5, #0 add r0, #0xc8 @@ -4272,7 +4272,7 @@ _021E9700: ldrb r0, [r5, #9] cmp r0, #1 beq _021E9714 - bl sub_02022974 + bl GF_AssertFail _021E9714: cmp r5, #0 beq _021E9738 @@ -4299,7 +4299,7 @@ _021E9738: _021E973A: cmp r5, #0 bne _021E9742 - bl sub_02022974 + bl GF_AssertFail _021E9742: ldr r0, [r4, #8] add r1, r5, #0 @@ -4374,14 +4374,14 @@ ov5_021E97AC: ; 0x021E97AC bl sub_0201CBB0 cmp r0, #0 bne _021E97D6 - bl sub_02022974 + bl GF_AssertFail _021E97D6: ldr r0, [r4, #0] bl NNS_G3dGetMdlSet ldrb r0, [r0, #9] cmp r0, #1 beq _021E97E6 - bl sub_02022974 + bl GF_AssertFail _021E97E6: ldr r0, [r4, #0] bl NNS_G3dGetMdlSet @@ -4410,7 +4410,7 @@ _021E9810: _021E9812: cmp r4, #0 bne _021E981A - bl sub_02022974 + bl GF_AssertFail _021E981A: add r0, r5, #0 add r1, r4, #0 @@ -5679,7 +5679,7 @@ ov5_021EA174: ; 0x021EA174 ldr r0, [r0, #0] cmp r1, r0 ble _021EA1B2 - bl sub_02022974 + bl GF_AssertFail _021EA1B2: ldr r0, [r4, #0x10] ldr r1, [r0, #0] @@ -5735,7 +5735,7 @@ _021EA20E: ror r1, r0 add r0, r2, r1 beq _021EA222 - bl sub_02022974 + bl GF_AssertFail _021EA222: mov r0, #0 str r0, [r4, #0x18] @@ -5752,7 +5752,7 @@ _021EA22C: ldr r0, [r2, #8] cmp r1, r0 beq _021EA244 - bl sub_02022974 + bl GF_AssertFail b _021EA30C _021EA244: cmp r3, r7 @@ -5803,7 +5803,7 @@ _021EA28E: ror r1, r0 add r0, r2, r1 beq _021EA304 - bl sub_02022974 + bl GF_AssertFail b _021EA304 _021EA2A4: add r1, r5, #0 @@ -5855,7 +5855,7 @@ _021EA2F0: ror r1, r0 add r0, r2, r1 beq _021EA304 - bl sub_02022974 + bl GF_AssertFail _021EA304: ldrb r0, [r4, #0x1c] add r1, r5, #0 diff --git a/asm/ov5_021EAFA4.s b/asm/ov5_021EAFA4.s index 54276be2cf..031b9d91bb 100644 --- a/asm/ov5_021EAFA4.s +++ b/asm/ov5_021EAFA4.s @@ -243,7 +243,7 @@ ov5_021EB184: ; 0x021EB184 cmp r0, #0 beq _021EB19E bne _021EB194 - bl sub_02022974 + bl GF_AssertFail _021EB194: ldr r0, [r4, #0] bl sub_020181C4 diff --git a/asm/ov5_021EB1A0.s b/asm/ov5_021EB1A0.s index 77af8ad0e7..875ce870ed 100644 --- a/asm/ov5_021EB1A0.s +++ b/asm/ov5_021EB1A0.s @@ -302,7 +302,7 @@ ov5_021EB398: ; 0x021EB398 add r5, r0, #0 cmp r5, #9 blt _021EB3D2 - bl sub_02022974 + bl GF_AssertFail _021EB3D2: lsl r6, r5, #2 ldr r5, _021EB408 ; =0x021FF3D4 @@ -762,7 +762,7 @@ ov5_021EB720: ; 0x021EB720 add r5, r0, #0 cmp r5, #0xa blt _021EB75A - bl sub_02022974 + bl GF_AssertFail _021EB75A: lsl r6, r5, #2 ldr r5, _021EB790 ; =0x021FF420 @@ -1235,7 +1235,7 @@ ov5_021EBAD0: ; 0x021EBAD0 add r5, r0, #0 cmp r5, #0xa blt _021EBB0A - bl sub_02022974 + bl GF_AssertFail _021EBB0A: lsl r6, r5, #2 ldr r5, _021EBB40 ; =0x021FF3F8 @@ -1811,7 +1811,7 @@ ov5_021EBF50: ; 0x021EBF50 str r0, [sp, #4] cmp r0, #0xb blt _021EBF8E - bl sub_02022974 + bl GF_AssertFail _021EBF8E: mov r1, #2 ldrsb r2, [r4, r1] @@ -2067,7 +2067,7 @@ ov5_021EC15C: ; 0x021EC15C add r5, r0, #0 cmp r5, #4 blt _021EC196 - bl sub_02022974 + bl GF_AssertFail _021EC196: lsl r6, r5, #2 ldr r5, _021EC1D4 ; =0x021FF31C @@ -2781,7 +2781,7 @@ _021EC71E: cmp r4, r1 bne _021EC70E _021EC726: - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} ; .align 2, 0 _021EC72C: .word 0x021FB51C @@ -2887,7 +2887,7 @@ ov5_021EC7D0: ; 0x021EC7D0 ldr r0, [r4, #0] cmp r0, #0 beq _021EC7E4 - bl sub_02022974 + bl GF_AssertFail _021EC7E4: add r0, r5, #0 bl ov5_021F2438 diff --git a/asm/ov5_021ECC20.s b/asm/ov5_021ECC20.s index bc28b78610..3a2f5b18bd 100644 --- a/asm/ov5_021ECC20.s +++ b/asm/ov5_021ECC20.s @@ -18,7 +18,7 @@ ov5_021ECC20: ; 0x021ECC20 bl sub_0206284C cmp r0, #0 beq _021ECC3A - bl sub_02022974 + bl GF_AssertFail _021ECC3A: add r0, r5, #0 bl ov5_021ECCA4 @@ -54,7 +54,7 @@ ov5_021ECC78: ; 0x021ECC78 bl sub_02062CA8 cmp r0, #1 beq _021ECC88 - bl sub_02022974 + bl GF_AssertFail _021ECC88: add r0, r4, #0 bl sub_0206285C @@ -144,7 +144,7 @@ _021ECD20: ldr r2, [r3, #0] cmp r2, r1 bne _021ECD16 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 diff --git a/asm/ov5_021ECE40.s b/asm/ov5_021ECE40.s index c48e300596..8df6820e17 100644 --- a/asm/ov5_021ECE40.s +++ b/asm/ov5_021ECE40.s @@ -134,7 +134,7 @@ ov5_021ECF1C: ; 0x021ECF1C bl ov5_021ED110 add r5, r0, #0 bne _021ECF48 - bl sub_02022974 + bl GF_AssertFail _021ECF48: add r0, r6, #0 add r1, sp, #0 @@ -148,7 +148,7 @@ _021ECF48: bl ov5_021EDDDC add r4, r0, #0 bne _021ECF6A - bl sub_02022974 + bl GF_AssertFail _021ECF6A: add r0, r4, #0 add sp, #0xc @@ -330,7 +330,7 @@ ov5_021ED0A4: ; 0x021ED0A4 str r6, [r0, #0] cmp r6, #0 bne _021ED0C4 - bl sub_02022974 + bl GF_AssertFail _021ED0C4: mov r0, #4 lsl r1, r5, #3 @@ -340,7 +340,7 @@ _021ED0C4: str r4, [r7, #0] cmp r4, #0 bne _021ED0DA - bl sub_02022974 + bl GF_AssertFail _021ED0DA: ldr r0, _021ED0EC ; =0x0000FFFF _021ED0DC: @@ -650,7 +650,7 @@ _021ED302: bl ov5_021ED2D0 add r7, r0, #0 bne _021ED314 - bl sub_02022974 + bl GF_AssertFail _021ED314: mov r0, #0x41 lsl r0, r0, #2 @@ -1008,7 +1008,7 @@ ov5_021ED56C: ; 0x021ED56C bl ov5_021ED50C cmp r0, #0 bne _021ED590 - bl sub_02022974 + bl GF_AssertFail _021ED590: pop {r4, r5, r6, pc} nop @@ -1049,7 +1049,7 @@ ov5_021ED5B4: ; 0x021ED5B4 bl ov5_021ED50C cmp r0, #0 bne _021ED5E2 - bl sub_02022974 + bl GF_AssertFail _021ED5E2: pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -1168,7 +1168,7 @@ ov5_021ED6A8: ; 0x021ED6A8 bl ov5_021ED50C cmp r0, #0 bne _021ED6CC - bl sub_02022974 + bl GF_AssertFail _021ED6CC: pop {r4, r5, r6, pc} nop @@ -1209,7 +1209,7 @@ ov5_021ED6F0: ; 0x021ED6F0 bl ov5_021ED50C cmp r0, #0 bne _021ED71E - bl sub_02022974 + bl GF_AssertFail _021ED71E: pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -1328,7 +1328,7 @@ ov5_021ED7E4: ; 0x021ED7E4 bl ov5_021ED50C cmp r0, #0 bne _021ED808 - bl sub_02022974 + bl GF_AssertFail _021ED808: pop {r4, r5, r6, pc} nop @@ -1394,7 +1394,7 @@ ov5_021ED858: ; 0x021ED858 bl ov5_021ED50C cmp r0, #0 bne _021ED886 - bl sub_02022974 + bl GF_AssertFail _021ED886: pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -2094,7 +2094,7 @@ _021EDD14: ldr r2, [r3, #0] cmp r2, r1 bne _021EDD0A - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -2445,7 +2445,7 @@ _021EDF88: cmp r2, r3 blt _021EDF70 _021EDF90: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _021EDF98: @@ -2661,7 +2661,7 @@ ov5_021EE0E8: ; 0x021EE0E8 bl sub_02022C9C cmp r0, #0 bne _021EE10E - bl sub_02022974 + bl GF_AssertFail _021EE10E: add r0, r5, #0 add r1, r4, #0 @@ -2713,7 +2713,7 @@ _021EE160: cmp r2, r6 blt _021EE14A _021EE168: - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} ; .align 2, 0 thumb_func_end ov5_021EE134 @@ -2860,7 +2860,7 @@ _021EE256: cmp r4, r6 blt _021EE23A _021EE25E: - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} thumb_func_end ov5_021EE228 @@ -2951,7 +2951,7 @@ ov5_021EE2D0: ; 0x021EE2D0 ldr r0, [r0, #0] cmp r0, #0 bne _021EE2F6 - bl sub_02022974 + bl GF_AssertFail _021EE2F6: ldr r0, [r4, #4] mov r1, #0 @@ -2997,7 +2997,7 @@ ov5_021EE320: ; 0x021EE320 bl sub_02018144 add r4, r0, #0 bne _021EE34E - bl sub_02022974 + bl GF_AssertFail _021EE34E: ldr r2, [sp, #8] add r0, r4, #0 @@ -3162,7 +3162,7 @@ _021EE4AA: ldr r0, _021EE688 ; =0x0000FFFF cmp r1, r0 bne _021EE4B4 - bl sub_02022974 + bl GF_AssertFail _021EE4B4: ldr r0, [sp, #0x20] ldr r1, [r4, #4] @@ -3185,7 +3185,7 @@ _021EE4D8: ldr r0, _021EE688 ; =0x0000FFFF cmp r1, r0 bne _021EE4E2 - bl sub_02022974 + bl GF_AssertFail _021EE4E2: ldr r0, [sp, #0x20] ldr r1, [r4, #4] @@ -3209,7 +3209,7 @@ _021EE508: ldr r0, _021EE688 ; =0x0000FFFF cmp r1, r0 bne _021EE512 - bl sub_02022974 + bl GF_AssertFail _021EE512: ldr r0, [sp, #0x20] ldr r1, [r4, #4] @@ -3248,7 +3248,7 @@ _021EE512: str r0, [r5, #0x24] cmp r0, #0 bne _021EE56E - bl sub_02022974 + bl GF_AssertFail _021EE56E: ldr r0, [r5, #0x24] str r0, [sp, #0x24] @@ -3347,7 +3347,7 @@ _021EE620: bl sub_0200DA3C add r4, r0, #0 bne _021EE65C - bl sub_02022974 + bl GF_AssertFail _021EE65C: add r0, r4, #0 add r1, r5, #0 diff --git a/asm/ov5_021EEF34.s b/asm/ov5_021EEF34.s index cf8398cdd1..712f7b4c6c 100644 --- a/asm/ov5_021EEF34.s +++ b/asm/ov5_021EEF34.s @@ -98,7 +98,7 @@ ov5_021EEF98: ; 0x021EEF98 lsl r0, r0, #0xc cmp r1, r0 ble _021EEFF4 - bl sub_02022974 + bl GF_AssertFail _021EEFF4: pop {r3, r4, r5, pc} ; .align 2, 0 diff --git a/asm/ov5_021EF250.s b/asm/ov5_021EF250.s index 23b7d064f3..afc8f76228 100644 --- a/asm/ov5_021EF250.s +++ b/asm/ov5_021EF250.s @@ -129,7 +129,7 @@ ov5_021EF314: ; 0x021EF314 str r3, [sp] cmp r3, #0 bne _021EF326 - bl sub_02022974 + bl GF_AssertFail _021EF326: ldr r0, [r5, #0] mov r4, #0 @@ -170,7 +170,7 @@ ov5_021EF35C: ; 0x021EF35C ldr r0, [r4, #0] cmp r5, r0 blt _021EF36C - bl sub_02022974 + bl GF_AssertFail _021EF36C: mov r0, #0x18 add r6, r5, #0 @@ -180,7 +180,7 @@ _021EF36C: ldr r0, [r0, #0x14] cmp r0, #0 bne _021EF380 - bl sub_02022974 + bl GF_AssertFail _021EF380: ldr r0, [r4, #4] add r0, r0, r6 @@ -197,7 +197,7 @@ ov5_021EF388: ; 0x021EF388 add r4, r1, #0 cmp r5, r0 blt _021EF39A - bl sub_02022974 + bl GF_AssertFail _021EF39A: mov r0, #0x18 ldr r1, [r6, #4] diff --git a/asm/ov5_021EF3A8.s b/asm/ov5_021EF3A8.s index 64d1347f58..12c038000b 100644 --- a/asm/ov5_021EF3A8.s +++ b/asm/ov5_021EF3A8.s @@ -46,7 +46,7 @@ ov5_021EF3DC: ; 0x021EF3DC bl sub_020177BC cmp r0, #1 beq _021EF3F0 - bl sub_02022974 + bl GF_AssertFail _021EF3F0: mov r0, #1 str r0, [r4, #0] @@ -64,7 +64,7 @@ ov5_021EF3FC: ; 0x021EF3FC bl sub_020177BC cmp r0, #1 beq _021EF410 - bl sub_02022974 + bl GF_AssertFail _021EF410: mov r0, #0 str r0, [r4, #0] @@ -80,7 +80,7 @@ ov5_021EF418: ; 0x021EF418 bl ov5_021EF49C add r4, r0, #0 bne _021EF42A - bl sub_02022974 + bl GF_AssertFail _021EF42A: cmp r4, #0 beq _021EF436 diff --git a/asm/ov5_021EF4BC.s b/asm/ov5_021EF4BC.s index 47d4f3e620..3ee46e6e37 100644 --- a/asm/ov5_021EF4BC.s +++ b/asm/ov5_021EF4BC.s @@ -62,7 +62,7 @@ ov5_021EF518: ; 0x021EF518 ldr r0, [r4, #0] cmp r0, #0 beq _021EF526 - bl sub_02022974 + bl GF_AssertFail _021EF526: mov r0, #0x31 lsl r0, r0, #4 diff --git a/asm/ov5_021EF75C.s b/asm/ov5_021EF75C.s index 6b54986cdc..f77ee7d11c 100644 --- a/asm/ov5_021EF75C.s +++ b/asm/ov5_021EF75C.s @@ -72,7 +72,7 @@ ov5_021EF7A0: ; 0x021EF7A0 strh r1, [r7, #8] cmp r1, r0 blo _021EF7DA - bl sub_02022974 + bl GF_AssertFail _021EF7DA: ldr r1, _021EF9C4 ; =0x00000C0C mov r0, #0 @@ -116,7 +116,7 @@ _021EF828: bl sub_0201CBCC cmp r0, #0 bne _021EF838 - bl sub_02022974 + bl GF_AssertFail _021EF838: ldr r1, _021EF9C8 ; =0x00000C04 ldr r0, [r5, r1] @@ -131,7 +131,7 @@ _021EF838: bl sub_0201CBCC cmp r0, #0 bne _021EF85A - bl sub_02022974 + bl GF_AssertFail _021EF85A: ldr r1, _021EF9CC ; =0x00000C08 ldr r0, [r5, r1] @@ -177,7 +177,7 @@ _021EF89E: ldr r0, [r4, #4] cmp r0, #0 beq _021EF8B6 - bl sub_02022974 + bl GF_AssertFail _021EF8B6: ldr r0, [sp, #0xc] add r1, r6, #0 @@ -226,7 +226,7 @@ _021EF902: bl sub_0201CBB0 cmp r0, #0 bne _021EF916 - bl sub_02022974 + bl GF_AssertFail _021EF916: ldr r0, [sp] ldrh r1, [r7, #8] @@ -252,14 +252,14 @@ _021EF928: bl sub_0201CBCC cmp r0, #0 bne _021EF94E - bl sub_02022974 + bl GF_AssertFail _021EF94E: ldr r0, [r5, #4] add r1, r4, #0 bl sub_0201CBB0 cmp r0, #0 bne _021EF95E - bl sub_02022974 + bl GF_AssertFail _021EF95E: ldr r0, [sp, #0xc] bl sub_02006CA8 @@ -321,7 +321,7 @@ ov5_021EF9E8: ; 0x021EF9E8 add r5, r0, #0 add r4, r1, #0 bne _021EF9F4 - bl sub_02022974 + bl GF_AssertFail _021EF9F4: add r2, r4, #4 lsl r1, r5, #2 @@ -331,7 +331,7 @@ _021EF9F4: ldr r0, [r4, #4] cmp r0, #0 bne _021EFA08 - bl sub_02022974 + bl GF_AssertFail _021EFA08: add r0, r4, #4 pop {r3, r4, r5, pc} @@ -404,7 +404,7 @@ ov5_021EFA8C: ; 0x021EFA8C push {r4, lr} add r4, r0, #0 bne _021EFA96 - bl sub_02022974 + bl GF_AssertFail _021EFA96: ldr r0, _021EFA9C ; =0x00000C0C ldr r0, [r4, r0] @@ -418,7 +418,7 @@ ov5_021EFAA0: ; 0x021EFAA0 push {r4, lr} add r4, r0, #0 bne _021EFAAA - bl sub_02022974 + bl GF_AssertFail _021EFAAA: mov r0, #0xc1 lsl r0, r0, #4 diff --git a/asm/ov5_021EFB0C.s b/asm/ov5_021EFB0C.s index 000753d613..3292715a2c 100644 --- a/asm/ov5_021EFB0C.s +++ b/asm/ov5_021EFB0C.s @@ -91,7 +91,7 @@ ov5_021EFB94: ; 0x021EFB94 add r5, r0, #0 cmp r5, #0x15 bne _021EFBAA - bl sub_02022974 + bl GF_AssertFail _021EFBAA: ldr r0, [r4, #0xc] bl sub_0202D834 @@ -128,7 +128,7 @@ ov5_021EFBDC: ; 0x021EFBDC add r5, r0, #0 cmp r5, #0x15 bne _021EFBF2 - bl sub_02022974 + bl GF_AssertFail _021EFBF2: ldr r0, [r6, #0xc] bl sub_0202D834 @@ -159,7 +159,7 @@ _021EFBF2: lsr r6, r0, #0x10 cmp r6, #0x64 blo _021EFC42 - bl sub_02022974 + bl GF_AssertFail _021EFC42: cmp r6, #0x5a bhs _021EFC56 @@ -209,7 +209,7 @@ ov5_021EFC90: ; 0x021EFC90 add r4, r0, #0 cmp r4, #0x15 bne _021EFCA8 - bl sub_02022974 + bl GF_AssertFail _021EFCA8: add r0, r5, #0 add r0, #0xa8 @@ -263,7 +263,7 @@ ov5_021EFCF8: ; 0x021EFCF8 lsr r4, r0, #0x10 cmp r4, #0x64 blo _021EFD16 - bl sub_02022974 + bl GF_AssertFail _021EFD16: cmp r6, #0 beq _021EFD3E @@ -318,7 +318,7 @@ ov5_021EFD58: ; 0x021EFD58 lsr r5, r0, #0x10 cmp r5, #0x64 blo _021EFD74 - bl sub_02022974 + bl GF_AssertFail _021EFD74: cmp r5, #5 bge _021EFD7E @@ -383,7 +383,7 @@ ov5_021EFDC0: ; 0x021EFDC0 lsr r5, r0, #0x10 cmp r5, #0x64 blo _021EFDDC - bl sub_02022974 + bl GF_AssertFail _021EFDDC: cmp r4, #3 bne _021EFDFC @@ -689,7 +689,7 @@ ov5_021EFFE4: ; 0x021EFFE4 add r5, r0, #0 cmp r5, #0x15 bne _021EFFFA - bl sub_02022974 + bl GF_AssertFail _021EFFFA: ldr r0, [r4, #0xc] bl sub_0202D834 @@ -737,7 +737,7 @@ ov5_021F0040: ; 0x021F0040 add r4, r0, #0 cmp r4, #0x15 bne _021F0056 - bl sub_02022974 + bl GF_AssertFail _021F0056: add r0, r5, #0 add r0, #0xa8 diff --git a/asm/ov5_021F007C.s b/asm/ov5_021F007C.s index fd82742e1d..115d727a6d 100644 --- a/asm/ov5_021F007C.s +++ b/asm/ov5_021F007C.s @@ -785,7 +785,7 @@ _021F0610: bl ov6_022411C8 cmp r0, #0 bne _021F066C - bl sub_02022974 + bl GF_AssertFail b _021F066C _021F0622: mov r0, #0xe @@ -823,7 +823,7 @@ _021F0664: mov r0, #1 pop {r4, r5, r6, pc} _021F0668: - bl sub_02022974 + bl GF_AssertFail _021F066C: mov r0, #0 pop {r4, r5, r6, pc} diff --git a/asm/ov5_021F067C.s b/asm/ov5_021F067C.s index e597c5b956..c44e638116 100644 --- a/asm/ov5_021F067C.s +++ b/asm/ov5_021F067C.s @@ -22,7 +22,7 @@ ov5_021F067C: ; 0x021F067C bl sub_02017FC8 cmp r0, #1 beq _021F069E - bl sub_02022974 + bl GF_AssertFail _021F069E: sub r5, r6, r5 add r0, r7, #0 @@ -30,7 +30,7 @@ _021F069E: bl sub_02018144 add r4, r0, #0 bne _021F06B0 - bl sub_02022974 + bl GF_AssertFail _021F06B0: add r0, r4, #0 mov r1, #0 @@ -94,7 +94,7 @@ ov5_021F070C: ; 0x021F070C str r0, [sp] cmp r0, #0 bne _021F0724 - bl sub_02022974 + bl GF_AssertFail _021F0724: add r0, r5, #0 add r1, r6, #0 @@ -116,7 +116,7 @@ ov5_021F0740: ; 0x021F0740 bl ov5_021F07DC add r4, r0, #0 bne _021F074E - bl sub_02022974 + bl GF_AssertFail _021F074E: ldr r0, [r4, #0] bl ov5_021F07D4 @@ -131,7 +131,7 @@ ov5_021F075C: ; 0x021F075C bl ov5_021F07DC add r4, r0, #0 bne _021F076A - bl sub_02022974 + bl GF_AssertFail _021F076A: ldr r0, [r4, #0] pop {r4, pc} @@ -191,7 +191,7 @@ _021F07C6: add r4, r0, #0 cmp r4, #0 bne _021F07D0 - bl sub_02022974 + bl GF_AssertFail _021F07D0: add r0, r4, #0 pop {r4, pc} diff --git a/asm/ov5_021F08CC.s b/asm/ov5_021F08CC.s index 12f8bd1cf6..26c8fae78b 100644 --- a/asm/ov5_021F08CC.s +++ b/asm/ov5_021F08CC.s @@ -627,7 +627,7 @@ ov5_021F0D1C: ; 0x021F0D1C bl sub_02018184 add r4, r0, #0 bne _021F0D30 - bl sub_02022974 + bl GF_AssertFail _021F0D30: add r0, r4, #0 mov r1, #0 @@ -796,7 +796,7 @@ ov5_021F0E58: ; 0x021F0E58 beq _021F0E6E cmp r0, #2 beq _021F0E72 - bl sub_02022974 + bl GF_AssertFail _021F0E6A: ldr r0, _021F0E78 ; =0x000001BD pop {r3, pc} diff --git a/asm/ov5_021F10E8.s b/asm/ov5_021F10E8.s index 360622484c..e5a585eb56 100644 --- a/asm/ov5_021F10E8.s +++ b/asm/ov5_021F10E8.s @@ -118,7 +118,7 @@ ov5_021F1188: ; 0x021F1188 add r4, r0, #0 cmp r5, #0 bne _021F119E - bl sub_02022974 + bl GF_AssertFail _021F119E: mov r1, #0x6c mov r2, #0 @@ -157,7 +157,7 @@ ov5_021F11C0: ; 0x021F11C0 bl ov5_021F1174 cmp r0, #0 bne _021F11EC - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _021F11EC: add r1, r4, #0 @@ -180,7 +180,7 @@ ov5_021F11FC: ; 0x021F11FC bl ov5_021F1174 add r4, r0, #0 bne _021F1214 - bl sub_02022974 + bl GF_AssertFail _021F1214: add r4, #0x18 add r0, r4, #0 diff --git a/asm/ov5_021F1CC8.s b/asm/ov5_021F1CC8.s index b898a08c1d..2c29fc71d0 100644 --- a/asm/ov5_021F1CC8.s +++ b/asm/ov5_021F1CC8.s @@ -184,7 +184,7 @@ _021F1DFA: _021F1E0E: cmp r4, #0 bne _021F1E16 - bl sub_02022974 + bl GF_AssertFail _021F1E16: add r0, r4, #0 pop {r3, r4, r5, pc} @@ -247,7 +247,7 @@ _021F1E6A: _021F1E7C: cmp r4, #0 bne _021F1E84 - bl sub_02022974 + bl GF_AssertFail _021F1E84: add r0, r4, #0 pop {r4, pc} diff --git a/asm/ov5_021F204C.s b/asm/ov5_021F204C.s index f63d26a15e..a607e23257 100644 --- a/asm/ov5_021F204C.s +++ b/asm/ov5_021F204C.s @@ -261,7 +261,7 @@ ov5_021F220C: ; 0x021F220C sub r1, r1, #1 str r1, [r0, #0] bpl _021F221A - bl sub_02022974 + bl GF_AssertFail _021F221A: pop {r3, pc} thumb_func_end ov5_021F220C diff --git a/asm/ov5_021F2850.s b/asm/ov5_021F2850.s index 892afdbf58..a2d378171e 100644 --- a/asm/ov5_021F2850.s +++ b/asm/ov5_021F2850.s @@ -44,7 +44,7 @@ ov5_021F287C: ; 0x021F287C sub r1, r1, #1 str r1, [r0, #0] bpl _021F288A - bl sub_02022974 + bl GF_AssertFail _021F288A: pop {r3, pc} thumb_func_end ov5_021F287C diff --git a/asm/ov5_021F348C.s b/asm/ov5_021F348C.s index c555802bb4..76056c57e0 100644 --- a/asm/ov5_021F348C.s +++ b/asm/ov5_021F348C.s @@ -276,7 +276,7 @@ _021F3686: ldr r0, [r0, #0] cmp r0, #1 beq _021F36B0 - bl sub_02022974 + bl GF_AssertFail _021F36B0: mov r0, #0xc mul r0, r4 diff --git a/asm/ov5_021F4018.s b/asm/ov5_021F4018.s index ca2516178c..21925be3a9 100644 --- a/asm/ov5_021F4018.s +++ b/asm/ov5_021F4018.s @@ -194,7 +194,7 @@ ov5_021F416C: ; 0x021F416C bl ov5_021DF4E4 cmp r0, #1 beq _021F4184 - bl sub_02022974 + bl GF_AssertFail _021F4184: ldr r0, [sp, #4] mov r1, #0x1e diff --git a/asm/ov5_021F428C.s b/asm/ov5_021F428C.s index 4a6cdcb677..24e122cd76 100644 --- a/asm/ov5_021F428C.s +++ b/asm/ov5_021F428C.s @@ -182,7 +182,7 @@ _021F43C4: ldr r7, [r6, r0] cmp r4, #0 bne _021F43D0 - bl sub_02022974 + bl GF_AssertFail _021F43D0: ldr r0, [sp, #4] mov r1, #0 @@ -211,7 +211,7 @@ _021F43F8: cmp r1, r4 blt _021F43EA _021F4400: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -307,7 +307,7 @@ ov5_021F44A4: ; 0x021F44A4 ldr r0, [r7, #0x74] cmp r0, #0 beq _021F44BC - bl sub_02022974 + bl GF_AssertFail _021F44BC: mov r2, #1 ldr r0, [sp, #4] @@ -379,7 +379,7 @@ ov5_021F453C: ; 0x021F453C ldr r0, [r4, #0x74] cmp r0, #0 bne _021F454E - bl sub_02022974 + bl GF_AssertFail _021F454E: ldr r0, [r4, #0x74] ldr r0, [r0, #0] @@ -485,7 +485,7 @@ ov5_021F45F8: ; 0x021F45F8 ldr r0, [r0, #0x74] cmp r0, #0 bne _021F4612 - bl sub_02022974 + bl GF_AssertFail _021F4612: ldr r0, [sp] mov r4, #0 diff --git a/asm/ov5_021F47B0.s b/asm/ov5_021F47B0.s index 7132e427b2..7d131e5079 100644 --- a/asm/ov5_021F47B0.s +++ b/asm/ov5_021F47B0.s @@ -415,7 +415,7 @@ ov5_021F4AB4: ; 0x021F4AB4 str r2, [sp, #0x10] add r0, r1, #0 bne _021F4AC6 - bl sub_02022974 + bl GF_AssertFail _021F4AC6: ldr r0, [sp, #8] bl sub_02063020 @@ -464,7 +464,7 @@ _021F4AF6: bl sub_0206326C add r4, r0, #0 bne _021F4B3A - bl sub_02022974 + bl GF_AssertFail _021F4B3A: ldr r1, [sp, #0x10] add r0, r4, #0 @@ -710,7 +710,7 @@ ov5_021F4CEC: ; 0x021F4CEC str r0, [r1, #8] cmp r4, #8 blt _021F4D0A - bl sub_02022974 + bl GF_AssertFail _021F4D0A: add r0, r6, #0 add r1, r7, #0 diff --git a/asm/ov5_021F50BC.s b/asm/ov5_021F50BC.s index 56da40ca50..17584b6aa7 100644 --- a/asm/ov5_021F50BC.s +++ b/asm/ov5_021F50BC.s @@ -147,7 +147,7 @@ ov5_021F51A4: ; 0x021F51A4 bl sub_02062764 cmp r0, #0 bne _021F51C0 - bl sub_02022974 + bl GF_AssertFail _021F51C0: ldr r0, [r4, #0] cmp r0, #0 diff --git a/asm/ov5_021F5284.s b/asm/ov5_021F5284.s index a90e343c92..bb811abedc 100644 --- a/asm/ov5_021F5284.s +++ b/asm/ov5_021F5284.s @@ -147,7 +147,7 @@ ov5_021F536C: ; 0x021F536C bl sub_02062764 cmp r0, #0 bne _021F5388 - bl sub_02022974 + bl GF_AssertFail _021F5388: add r0, r5, #0 add r1, sp, #0 diff --git a/asm/ov5_021F5A10.s b/asm/ov5_021F5A10.s index d59f6e2330..bcc53047fc 100644 --- a/asm/ov5_021F5A10.s +++ b/asm/ov5_021F5A10.s @@ -49,7 +49,7 @@ ov5_021F5A40: ; 0x021F5A40 ldrsh r0, [r0, r1] cmp r0, #0 bge _021F5A54 - bl sub_02022974 + bl GF_AssertFail _021F5A54: pop {r3, pc} ; .align 2, 0 @@ -75,7 +75,7 @@ ov5_021F5A64: ; 0x021F5A64 ldrsh r0, [r0, r1] cmp r0, #0 bge _021F5A78 - bl sub_02022974 + bl GF_AssertFail _021F5A78: pop {r3, pc} ; .align 2, 0 @@ -631,7 +631,7 @@ ov5_021F5E58: ; 0x021F5E58 bl sub_02062764 cmp r0, #0 bne _021F5E74 - bl sub_02022974 + bl GF_AssertFail _021F5E74: add r0, r6, #0 add r1, sp, #0 @@ -737,7 +737,7 @@ ov5_021F5F24: ; 0x021F5F24 bl sub_02062764 cmp r0, #0 bne _021F5F40 - bl sub_02022974 + bl GF_AssertFail _021F5F40: add r0, r6, #0 add r1, sp, #0 diff --git a/asm/ov5_021F77A8.s b/asm/ov5_021F77A8.s index 8ee8b524a3..1f93dc75bf 100644 --- a/asm/ov5_021F77A8.s +++ b/asm/ov5_021F77A8.s @@ -170,7 +170,7 @@ _021F78FA: _021F7902: cmp r1, #0x26 bne _021F7912 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 add sp, #0xc strh r0, [r5] @@ -284,7 +284,7 @@ _021F79E0: _021F79E8: cmp r1, #0x26 bne _021F79F0 - bl sub_02022974 + bl GF_AssertFail _021F79F0: ldr r2, [sp, #4] add r0, r4, #0 @@ -345,7 +345,7 @@ _021F7A5E: add r3, #0xc cmp r2, #0x26 blo _021F7A52 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} nop diff --git a/asm/ov5_021F8560.s b/asm/ov5_021F8560.s index 7a6ded24f9..8db4175fd0 100644 --- a/asm/ov5_021F8560.s +++ b/asm/ov5_021F8560.s @@ -235,7 +235,7 @@ _021F86FA: sub r0, r0, #5 cmp r1, r0 bne _021F8718 - bl sub_02022974 + bl GF_AssertFail _021F8718: ldr r1, [r5, #0x2c] ldr r0, [r5, #0x30] @@ -429,7 +429,7 @@ ov5_021F8878: ; 0x021F8878 add r4, r2, #0 cmp r5, #6 blo _021F8888 - bl sub_02022974 + bl GF_AssertFail _021F8888: ldr r0, _021F88A4 ; =0x02201C58 lsl r1, r5, #5 diff --git a/asm/ov61_0222B008.s b/asm/ov61_0222B008.s index 5f8eda8588..8f578d48b8 100644 --- a/asm/ov61_0222B008.s +++ b/asm/ov61_0222B008.s @@ -99,7 +99,7 @@ _0222B02C: blx ov61_0222DCDC cmp r0, #1 beq _0222B0D4 - bl sub_02022974 + bl GF_AssertFail _0222B0D4: mov r1, #0xf1 mov r0, #1 @@ -443,7 +443,7 @@ _0222B34A: ldr r0, _0222B388 ; =0x00001D4C cmp r1, r0 beq _0222B35A - bl sub_02022974 + bl GF_AssertFail _0222B35A: bl sub_0202F27C mov r1, #0x19 @@ -1095,7 +1095,7 @@ _0222B820: add r4, r0, #0 b _0222B83C _0222B838: - bl sub_02022974 + bl GF_AssertFail _0222B83C: cmp r4, #1 bne _0222B84A @@ -1283,7 +1283,7 @@ ov61_0222B960: ; 0x0222B960 ldrh r0, [r4] cmp r1, r0 beq _0222B980 - bl sub_02022974 + bl GF_AssertFail _0222B980: mov r0, #1 mov r1, #0 diff --git a/asm/ov61_0222BC4C.s b/asm/ov61_0222BC4C.s index 8ff064828c..306b5daf9e 100644 --- a/asm/ov61_0222BC4C.s +++ b/asm/ov61_0222BC4C.s @@ -155,7 +155,7 @@ ov61_0222BD18: ; 0x0222BD18 cmp r4, r5 ble _0222BD30 add r4, r5, #0 - bl sub_02022974 + bl GF_AssertFail _0222BD30: add r3, r7, #4 mov r2, #0 @@ -333,7 +333,7 @@ ov61_0222BE20: ; 0x0222BE20 cmp r1, r0 ble _0222BE40 str r0, [sp, #0xc] - bl sub_02022974 + bl GF_AssertFail _0222BE40: ldr r0, [sp, #0xc] add r5, r4, #4 diff --git a/asm/ov61_0222BF44.s b/asm/ov61_0222BF44.s index a9af2df422..410ce7f93e 100644 --- a/asm/ov61_0222BF44.s +++ b/asm/ov61_0222BF44.s @@ -669,7 +669,7 @@ _0222C518: ldr r0, [sp, #0x24] cmp r0, #0x15 blt _0222C522 - bl sub_02022974 + bl GF_AssertFail _0222C522: ldr r0, [sp, #0x30] mov r7, #1 diff --git a/asm/ov62_0222F2C0.s b/asm/ov62_0222F2C0.s index 77a58054ec..4d14d138b3 100644 --- a/asm/ov62_0222F2C0.s +++ b/asm/ov62_0222F2C0.s @@ -641,7 +641,7 @@ ov62_0222F848: ; 0x0222F848 bl sub_0200C7C0 cmp r0, #0 bne _0222F8B2 - bl sub_02022974 + bl GF_AssertFail _0222F8B2: ldr r0, [r4, #0x18] ldr r1, [r4, #0x1c] @@ -649,7 +649,7 @@ _0222F8B2: bl sub_0200CB30 cmp r0, #0 bne _0222F8C4 - bl sub_02022974 + bl GF_AssertFail _0222F8C4: ldr r0, [r4, #0x18] bl sub_0200C738 @@ -1643,7 +1643,7 @@ _02230072: beq _0223007C mov r1, #0 str r1, [r4, r0] - bl sub_02022974 + bl GF_AssertFail _0223007C: ldr r0, _02230090 ; =0x000006D8 ldr r0, [r4, r0] diff --git a/asm/ov62_02231690.s b/asm/ov62_02231690.s index 0b39f6e78d..cf1d214c70 100644 --- a/asm/ov62_02231690.s +++ b/asm/ov62_02231690.s @@ -168,7 +168,7 @@ _022317A8: ldr r0, [r6, r0] pop {r4, r5, r6, r7, pc} _022317B0: - bl sub_02022974 + bl GF_AssertFail ldr r0, [sp, #0x58] add sp, #0x74 pop {r4, r5, r6, r7, pc} @@ -1416,7 +1416,7 @@ ov62_02232234: ; 0x02232234 cmp r0, #0 bge _02232246 _02232240: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 _02232246: cmp r4, #4 @@ -3448,7 +3448,7 @@ _02233254: _0223326A: cmp r4, #0 bge _02233272 - bl sub_02022974 + bl GF_AssertFail _02233272: cmp r6, #0xff beq _02233278 @@ -4264,7 +4264,7 @@ _0223385C: ldr r0, [r5, r0] cmp r0, #0 bne _02233868 - bl sub_02022974 + bl GF_AssertFail _02233868: ldr r0, _022338A0 ; =0x00002608 add r1, r6, #0 @@ -5841,7 +5841,7 @@ _022344EE: sub r0, r2, #4 ldr r0, [r4, r0] bl sub_0208B9E0 - bl sub_02022974 + bl GF_AssertFail add sp, #8 pop {r4, pc} nop @@ -6035,7 +6035,7 @@ _02234654: add r4, #0x40 b _022348AE _02234658: - bl sub_02022974 + bl GF_AssertFail b _022348AE _0223465E: cmp r1, #9 @@ -6088,7 +6088,7 @@ _022346A6: add r4, #0x4a b _022348AE _022346AA: - bl sub_02022974 + bl GF_AssertFail b _022348AE _022346B0: cmp r6, #8 @@ -6145,7 +6145,7 @@ _02234702: mov r4, #0xc7 b _022348AE _02234706: - bl sub_02022974 + bl GF_AssertFail b _022348AE _0223470C: cmp r1, #3 @@ -6174,7 +6174,7 @@ _02234730: mov r4, #0xcb b _022348AE _02234734: - bl sub_02022974 + bl GF_AssertFail b _022348AE _0223473A: cmp r1, #6 @@ -6215,7 +6215,7 @@ _02234770: mov r4, #0xd2 b _022348AE _02234774: - bl sub_02022974 + bl GF_AssertFail b _022348AE _0223477A: cmp r1, #3 @@ -6244,7 +6244,7 @@ _0223479E: mov r4, #0xd6 b _022348AE _022347A2: - bl sub_02022974 + bl GF_AssertFail b _022348AE _022347A8: cmp r1, #0 @@ -6264,7 +6264,7 @@ _022347BE: mov r4, #0xd9 b _022348AE _022347C2: - bl sub_02022974 + bl GF_AssertFail b _022348AE _022347C8: cmp r1, #5 @@ -6301,7 +6301,7 @@ _022347F8: mov r4, #0xdf b _022348AE _022347FC: - bl sub_02022974 + bl GF_AssertFail b _022348AE _02234802: cmp r1, #7 @@ -6346,7 +6346,7 @@ _0223483E: mov r4, #0xe7 b _022348AE _02234842: - bl sub_02022974 + bl GF_AssertFail b _022348AE _02234848: cmp r1, #3 @@ -6375,7 +6375,7 @@ _0223486C: mov r4, #0xeb b _022348AE _02234870: - bl sub_02022974 + bl GF_AssertFail b _022348AE nop _02234878: .word 0x00000504 @@ -6406,10 +6406,10 @@ _022348A0: mov r4, #0xef b _022348AE _022348A4: - bl sub_02022974 + bl GF_AssertFail b _022348AE _022348AA: - bl sub_02022974 + bl GF_AssertFail _022348AE: mov r0, #0x51 lsl r0, r0, #4 diff --git a/asm/ov62_02235278.s b/asm/ov62_02235278.s index 1a20f02d6e..fc8a84c71c 100644 --- a/asm/ov62_02235278.s +++ b/asm/ov62_02235278.s @@ -83,7 +83,7 @@ _02235304: .word 0x02248BEC ov62_02235308: ; 0x02235308 push {r4, lr} add r4, r0, #0 - bl sub_02022974 + bl GF_AssertFail mov r0, #1 str r0, [r4, #0x44] add r0, r4, #0 diff --git a/asm/ov62_0223CAEC.s b/asm/ov62_0223CAEC.s index f6414a37fe..f31b8fa0d7 100644 --- a/asm/ov62_0223CAEC.s +++ b/asm/ov62_0223CAEC.s @@ -808,7 +808,7 @@ ov62_0223D124: ; 0x0223D124 cmp r5, #0x57 blt _0223D134 mov r5, #0 - bl sub_02022974 + bl GF_AssertFail _0223D134: ldr r6, _0223D158 ; =0x022497E8 lsl r5, r5, #2 @@ -816,7 +816,7 @@ _0223D134: ldr r0, _0223D15C ; =0x0000FFFF cmp r1, r0 bne _0223D144 - bl sub_02022974 + bl GF_AssertFail _0223D144: mov r0, #0x83 lsl r0, r0, #4 @@ -2350,7 +2350,7 @@ _0223DE5A: thumb_func_start ov62_0223DE60 ov62_0223DE60: ; 0x0223DE60 push {r3, lr} - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 diff --git a/asm/ov62_0223DFA8.s b/asm/ov62_0223DFA8.s index 71b151ec0e..290ce58468 100644 --- a/asm/ov62_0223DFA8.s +++ b/asm/ov62_0223DFA8.s @@ -2510,7 +2510,7 @@ _0223F45A: str r0, [r4, #8] b _0223F644 _0223F462: - bl sub_02022974 + bl GF_AssertFail b _0223F644 _0223F468: add r0, r4, #0 diff --git a/asm/ov62_02246B00.s b/asm/ov62_02246B00.s index 41d3938501..15ec6c4c34 100644 --- a/asm/ov62_02246B00.s +++ b/asm/ov62_02246B00.s @@ -53,11 +53,11 @@ ov62_02246B4C: ; 0x02246B4C ldr r0, [r4, #0x18] cmp r0, #0 bne _02246B5A - bl sub_02022974 + bl GF_AssertFail _02246B5A: cmp r4, #0 bne _02246B62 - bl sub_02022974 + bl GF_AssertFail _02246B62: ldr r0, [r4, #0x18] bl sub_020237BC diff --git a/asm/ov62_02248408.s b/asm/ov62_02248408.s index 5c28e2a192..2866293278 100644 --- a/asm/ov62_02248408.s +++ b/asm/ov62_02248408.s @@ -216,7 +216,7 @@ _022485AE: ldr r0, [r0, #0] cmp r0, #0 bne _022485BA - bl sub_02022974 + bl GF_AssertFail _022485BA: cmp r5, #1 bne _022485E2 @@ -277,7 +277,7 @@ ov62_02248624: ; 0x02248624 ldr r0, [r0, #0] cmp r0, #0 bne _02248632 - bl sub_02022974 + bl GF_AssertFail _02248632: ldr r0, _0224864C ; =0x021C07A4 ldr r1, _02248650 ; =0x00001D4C @@ -314,7 +314,7 @@ _0224866C: ldr r0, [r0, #0] cmp r0, #0 bne _02248678 - bl sub_02022974 + bl GF_AssertFail _02248678: ldr r0, _022486A0 ; =0x021C07A4 ldr r1, [r0, #0] @@ -350,7 +350,7 @@ ov62_022486A4: ; 0x022486A4 ldr r0, [r0, #0] cmp r0, #0 bne _022486B6 - bl sub_02022974 + bl GF_AssertFail _022486B6: ldr r1, _0224871C ; =0x021C07A4 mov r2, #1 diff --git a/asm/ov63_0222AE60.s b/asm/ov63_0222AE60.s index c250d6bbf5..4404a50ff0 100644 --- a/asm/ov63_0222AE60.s +++ b/asm/ov63_0222AE60.s @@ -165,7 +165,7 @@ ov63_0222AF94: ; 0x0222AF94 bl ov63_0222B47C cmp r0, #0 bne _0222AFB0 - bl sub_02022974 + bl GF_AssertFail _0222AFB0: add r0, r4, #0 bl ov63_0222B450 @@ -246,7 +246,7 @@ ov63_0222B02C: ; 0x0222B02C str r2, [sp, #0xc] add r0, r2, #0 bne _0222B040 - bl sub_02022974 + bl GF_AssertFail _0222B040: ldr r1, [sp, #8] add r0, r7, #0 @@ -338,7 +338,7 @@ ov63_0222B0C0: ; 0x0222B0C0 bl ov63_0222B7D4 cmp r0, #1 beq _0222B0EA - bl sub_02022974 + bl GF_AssertFail _0222B0EA: mov r0, #0 add r2, sp, #0xc @@ -663,11 +663,11 @@ ov63_0222B308: ; 0x0222B308 add r6, r2, #0 cmp r4, #0xa blt _0222B318 - bl sub_02022974 + bl GF_AssertFail _0222B318: cmp r6, #4 blt _0222B320 - bl sub_02022974 + bl GF_AssertFail _0222B320: str r4, [r5, #0xc] mov r0, #0 @@ -735,7 +735,7 @@ ov63_0222B374: ; 0x0222B374 ldr r0, [r1, r0] cmp r0, #0 beq _0222B392 - bl sub_02022974 + bl GF_AssertFail _0222B392: ldr r0, _0222B3F8 ; =0x0222D970 ldr r6, _0222B3FC ; =0x0222D900 @@ -803,7 +803,7 @@ ov63_0222B404: ; 0x0222B404 ldr r0, [r1, r0] cmp r0, #0 bne _0222B418 - bl sub_02022974 + bl GF_AssertFail _0222B418: mov r4, #0 add r5, r6, r5 @@ -853,7 +853,7 @@ _0222B464: add r3, r3, #4 cmp r2, #0x97 blt _0222B456 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -894,7 +894,7 @@ ov63_0222B49C: ; 0x0222B49C beq _0222B4B0 cmp r4, #3 beq _0222B4B0 - bl sub_02022974 + bl GF_AssertFail _0222B4B0: sub r1, r4, #2 cmp r6, #0 @@ -926,7 +926,7 @@ ov63_0222B4CC: ; 0x0222B4CC add r7, r3, #0 cmp r0, #0 beq _0222B4E6 - bl sub_02022974 + bl GF_AssertFail _0222B4E6: ldr r0, [sp, #0x1c] cmp r0, #0 @@ -1046,13 +1046,13 @@ _0222B5C0: bl sub_0200A450 cmp r0, #0 bne _0222B5CE - bl sub_02022974 + bl GF_AssertFail _0222B5CE: ldr r0, [r7, r4] bl sub_0200A640 cmp r0, #0 bne _0222B5DC - bl sub_02022974 + bl GF_AssertFail _0222B5DC: ldr r0, [r5, #4] cmp r0, #0 @@ -1174,7 +1174,7 @@ _0222B6CA: bl sub_0200A450 cmp r0, #0 bne _0222B6D8 - bl sub_02022974 + bl GF_AssertFail _0222B6D8: ldr r0, [r6, r4] bl sub_02009D4C @@ -1236,7 +1236,7 @@ ov63_0222B738: ; 0x0222B738 ldr r0, [r0, #0x14] cmp r0, #0 bne _0222B750 - bl sub_02022974 + bl GF_AssertFail _0222B750: add r0, r5, r4 ldr r0, [r0, #0x10] @@ -1333,7 +1333,7 @@ ov63_0222B7E8: ; 0x0222B7E8 add r7, r2, #0 cmp r0, #0 beq _0222B7FE - bl sub_02022974 + bl GF_AssertFail _0222B7FE: mov r4, #0 add r0, r6, #0 @@ -1376,7 +1376,7 @@ _0222B83A: _0222B84C: cmp r4, #1 beq _0222B854 - bl sub_02022974 + bl GF_AssertFail _0222B854: mov r4, #0 add r5, r6, #0 @@ -1419,7 +1419,7 @@ _0222B858: bl sub_0200A450 cmp r0, #0 bne _0222B8AE - bl sub_02022974 + bl GF_AssertFail _0222B8AE: ldr r0, _0222B904 ; =0x00002248 ldr r0, [r6, r0] @@ -1535,7 +1535,7 @@ ov63_0222B97C: ; 0x0222B97C add r6, r2, #0 cmp r0, #0 beq _0222B992 - bl sub_02022974 + bl GF_AssertFail _0222B992: ldr r0, _0222B9E4 ; =0x00000402 mov r2, #0 @@ -1556,7 +1556,7 @@ _0222B992: bl sub_0200A640 cmp r0, #0 bne _0222B9C0 - bl sub_02022974 + bl GF_AssertFail _0222B9C0: ldr r0, [r5, #4] cmp r0, #0 @@ -1586,7 +1586,7 @@ ov63_0222B9EC: ; 0x0222B9EC ldr r0, [r4, r0] cmp r0, #0 bne _0222B9FC - bl sub_02022974 + bl GF_AssertFail _0222B9FC: ldr r0, _0222BA18 ; =0x00002290 ldr r0, [r4, r0] @@ -1615,7 +1615,7 @@ ov63_0222BA20: ; 0x0222BA20 ldr r0, [r5, r0] cmp r0, #0 beq _0222BA34 - bl sub_02022974 + bl GF_AssertFail _0222BA34: mov r0, #0x11 mov r4, #0 @@ -1683,7 +1683,7 @@ ov63_0222BAB0: ; 0x0222BAB0 ldr r0, [r5, r0] cmp r0, #0 bne _0222BAC0 - bl sub_02022974 + bl GF_AssertFail _0222BAC0: mov r6, #0 add r4, r5, #0 @@ -1742,7 +1742,7 @@ _0222BB24: cmp r6, r0 blo _0222BB0E _0222BB2E: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} ; .align 2, 0 diff --git a/asm/ov63_0222BCE8.s b/asm/ov63_0222BCE8.s index ce81a74206..d422ff1733 100644 --- a/asm/ov63_0222BCE8.s +++ b/asm/ov63_0222BCE8.s @@ -17,7 +17,7 @@ ov63_0222BCE8: ; 0x0222BCE8 bl sub_02018144 add r4, r0, #0 bne _0222BD00 - bl sub_02022974 + bl GF_AssertFail _0222BD00: strh r5, [r4] strh r6, [r4, #2] @@ -30,7 +30,7 @@ _0222BD00: str r0, [r4, #4] cmp r0, #0 bne _0222BD1C - bl sub_02022974 + bl GF_AssertFail _0222BD1C: ldrh r3, [r4] ldrh r2, [r4, #2] @@ -48,7 +48,7 @@ ov63_0222BD30: ; 0x0222BD30 push {r4, lr} add r4, r0, #0 bne _0222BD3A - bl sub_02022974 + bl GF_AssertFail _0222BD3A: ldr r0, [r4, #4] bl sub_020181C4 @@ -76,7 +76,7 @@ ov63_0222BD50: ; 0x0222BD50 add r5, r1, #0 cmp r4, #0 bne _0222BD5E - bl sub_02022974 + bl GF_AssertFail _0222BD5E: ldrh r3, [r4] ldrh r2, [r4, #2] @@ -100,7 +100,7 @@ ov63_0222BD70: ; 0x0222BD70 str r0, [sp] cmp r5, #0 bne _0222BD88 - bl sub_02022974 + bl GF_AssertFail _0222BD88: ldrh r2, [r5] cmp r2, r4 @@ -132,7 +132,7 @@ ov63_0222BDAC: ; 0x0222BDAC add r6, r2, #0 cmp r5, #0 bne _0222BDBE - bl sub_02022974 + bl GF_AssertFail _0222BDBE: add r0, r5, #0 add r1, r4, #0 @@ -164,7 +164,7 @@ ov63_0222BDE4: ; 0x0222BDE4 add r6, r2, #0 cmp r5, #0 bne _0222BDF6 - bl sub_02022974 + bl GF_AssertFail _0222BDF6: add r0, r5, #0 add r1, r4, #0 diff --git a/asm/ov63_0222BE18.s b/asm/ov63_0222BE18.s index 5c17f0c8c3..0933264c03 100644 --- a/asm/ov63_0222BE18.s +++ b/asm/ov63_0222BE18.s @@ -16,7 +16,7 @@ ov63_0222BE18: ; 0x0222BE18 bl sub_02018144 add r4, r0, #0 bne _0222BE2E - bl sub_02022974 + bl GF_AssertFail _0222BE2E: mov r1, #0x18 add r0, r6, #0 @@ -26,7 +26,7 @@ _0222BE2E: str r0, [r4, #0] cmp r0, #0 bne _0222BE44 - bl sub_02022974 + bl GF_AssertFail _0222BE44: ldr r3, [r4, #4] mov r2, #0x18 @@ -44,7 +44,7 @@ ov63_0222BE58: ; 0x0222BE58 push {r4, lr} add r4, r0, #0 bne _0222BE62 - bl sub_02022974 + bl GF_AssertFail _0222BE62: ldr r0, [r4, #0] bl sub_020181C4 @@ -96,7 +96,7 @@ ov63_0222BEB0: ; 0x0222BEB0 push {r4, lr} add r4, r0, #0 bne _0222BEBA - bl sub_02022974 + bl GF_AssertFail _0222BEBA: ldr r0, [r4, #4] pop {r4, pc} @@ -110,11 +110,11 @@ ov63_0222BEC0: ; 0x0222BEC0 add r4, r1, #0 cmp r5, #0 bne _0222BECE - bl sub_02022974 + bl GF_AssertFail _0222BECE: cmp r4, #0 bne _0222BED6 - bl sub_02022974 + bl GF_AssertFail _0222BED6: add r0, r5, #0 bl ov63_0222C0B8 @@ -197,12 +197,12 @@ ov63_0222BF50: ; 0x0222BF50 add r4, r1, #0 cmp r5, #0 bne _0222BF5E - bl sub_02022974 + bl GF_AssertFail _0222BF5E: ldr r0, [r5, #4] cmp r4, r0 blo _0222BF68 - bl sub_02022974 + bl GF_AssertFail _0222BF68: ldr r2, [r5, #0] mov r0, #0x18 @@ -242,7 +242,7 @@ ov63_0222BF90: ; 0x0222BF90 add r6, r1, #0 cmp r4, #0 bne _0222BF9E - bl sub_02022974 + bl GF_AssertFail _0222BF9E: cmp r6, #0xa bhi _0222BFF8 @@ -302,7 +302,7 @@ _0222BFF4: ldrh r5, [r4, #0x16] b _0222BFFC _0222BFF8: - bl sub_02022974 + bl GF_AssertFail _0222BFFC: add r0, r5, #0 pop {r4, r5, r6, pc} @@ -316,7 +316,7 @@ ov63_0222C000: ; 0x0222C000 add r4, r2, #0 cmp r5, #0 bne _0222C010 - bl sub_02022974 + bl GF_AssertFail _0222C010: cmp r6, #0xa bhi _0222C072 @@ -356,14 +356,14 @@ _0222C046: _0222C04A: cmp r4, #0xc blt _0222C052 - bl sub_02022974 + bl GF_AssertFail _0222C052: strb r4, [r5, #0x15] pop {r4, r5, r6, pc} _0222C056: cmp r4, #4 blt _0222C05E - bl sub_02022974 + bl GF_AssertFail _0222C05E: strb r4, [r5, #0x14] pop {r4, r5, r6, pc} @@ -380,7 +380,7 @@ _0222C06E: strh r4, [r5, #0x16] pop {r4, r5, r6, pc} _0222C072: - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} thumb_func_end ov63_0222C000 @@ -444,7 +444,7 @@ _0222C0D4: cmp r1, r4 blo _0222C0C6 _0222C0DC: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} thumb_func_end ov63_0222C0B8 @@ -839,7 +839,7 @@ ov63_0222C3AC: ; 0x0222C3AC add r4, r2, #0 cmp r5, #0 bne _0222C3BC - bl sub_02022974 + bl GF_AssertFail _0222C3BC: add r1, sp, #0x10 ldrh r2, [r1, #4] @@ -883,7 +883,7 @@ ov63_0222C404: ; 0x0222C404 add r4, r2, #0 cmp r5, #0 bne _0222C414 - bl sub_02022974 + bl GF_AssertFail _0222C414: add r1, sp, #0x10 ldrh r2, [r1, #4] @@ -936,7 +936,7 @@ ov63_0222C470: ; 0x0222C470 add r4, r2, #0 cmp r5, #0 bne _0222C482 - bl sub_02022974 + bl GF_AssertFail _0222C482: add r0, sp, #0x18 ldrh r1, [r0, #4] @@ -1009,7 +1009,7 @@ ov63_0222C508: ; 0x0222C508 add r4, r2, #0 cmp r5, #0 bne _0222C51A - bl sub_02022974 + bl GF_AssertFail _0222C51A: add r0, sp, #0x18 ldrh r1, [r0, #4] @@ -1081,7 +1081,7 @@ ov63_0222C5A0: ; 0x0222C5A0 add r4, r2, #0 cmp r5, #0 bne _0222C5B0 - bl sub_02022974 + bl GF_AssertFail _0222C5B0: add r1, sp, #0x10 ldrh r2, [r1, #4] @@ -1125,7 +1125,7 @@ ov63_0222C5F8: ; 0x0222C5F8 add r4, r2, #0 cmp r5, #0 bne _0222C608 - bl sub_02022974 + bl GF_AssertFail _0222C608: add r1, sp, #0x10 ldrh r2, [r1, #4] @@ -1178,7 +1178,7 @@ ov63_0222C664: ; 0x0222C664 add r4, r2, #0 cmp r5, #0 bne _0222C676 - bl sub_02022974 + bl GF_AssertFail _0222C676: add r0, sp, #0x18 ldrh r1, [r0, #4] @@ -1251,7 +1251,7 @@ ov63_0222C6FC: ; 0x0222C6FC add r4, r2, #0 cmp r5, #0 bne _0222C70E - bl sub_02022974 + bl GF_AssertFail _0222C70E: add r0, sp, #0x18 ldrh r1, [r0, #4] @@ -1323,7 +1323,7 @@ ov63_0222C794: ; 0x0222C794 add r4, r2, #0 cmp r5, #0 bne _0222C7A4 - bl sub_02022974 + bl GF_AssertFail _0222C7A4: add r1, sp, #0x10 ldrh r2, [r1, #4] @@ -1375,7 +1375,7 @@ ov63_0222C800: ; 0x0222C800 add r4, r2, #0 cmp r5, #0 bne _0222C810 - bl sub_02022974 + bl GF_AssertFail _0222C810: add r1, sp, #0x10 ldrh r2, [r1, #4] @@ -1427,7 +1427,7 @@ ov63_0222C86C: ; 0x0222C86C add r4, r2, #0 cmp r5, #0 bne _0222C87C - bl sub_02022974 + bl GF_AssertFail _0222C87C: add r1, sp, #0x10 ldrh r2, [r1, #4] @@ -1479,7 +1479,7 @@ ov63_0222C8D8: ; 0x0222C8D8 add r4, r2, #0 cmp r5, #0 bne _0222C8E8 - bl sub_02022974 + bl GF_AssertFail _0222C8E8: add r1, sp, #0x10 ldrh r2, [r1, #4] diff --git a/asm/ov63_0222CA88.s b/asm/ov63_0222CA88.s index a1e7b3c75d..078a9f9bec 100644 --- a/asm/ov63_0222CA88.s +++ b/asm/ov63_0222CA88.s @@ -16,19 +16,19 @@ ov63_0222CA88: ; 0x0222CA88 add r6, r3, #0 cmp r7, #0 bne _0222CA9C - bl sub_02022974 + bl GF_AssertFail _0222CA9C: cmp r5, #0 bne _0222CAA4 - bl sub_02022974 + bl GF_AssertFail _0222CAA4: cmp r4, #0 bne _0222CAAC - bl sub_02022974 + bl GF_AssertFail _0222CAAC: cmp r6, #0 bne _0222CAB4 - bl sub_02022974 + bl GF_AssertFail _0222CAB4: ldrb r1, [r4, #3] add r0, r5, #0 @@ -36,7 +36,7 @@ _0222CAB4: str r0, [sp, #4] cmp r0, #0 bne _0222CAC6 - bl sub_02022974 + bl GF_AssertFail _0222CAC6: str r6, [sp] add r3, r4, #0 @@ -207,7 +207,7 @@ _0222CBF4: thumb_func_start ov63_0222CBF8 ov63_0222CBF8: ; 0x0222CBF8 push {r3, lr} - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 diff --git a/asm/ov63_0222CCE4.s b/asm/ov63_0222CCE4.s index de8edb6bf0..468a338760 100644 --- a/asm/ov63_0222CCE4.s +++ b/asm/ov63_0222CCE4.s @@ -553,7 +553,7 @@ _0222D0B0: cmp r6, r0 blt _0222D09A _0222D0BA: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} ; .align 2, 0 diff --git a/asm/ov63_0222D1C0.s b/asm/ov63_0222D1C0.s index 1093ad4ba1..ccf4b2e86b 100644 --- a/asm/ov63_0222D1C0.s +++ b/asm/ov63_0222D1C0.s @@ -641,11 +641,11 @@ ov63_0222D688: ; 0x0222D688 add r4, r1, #0 cmp r5, #0x40 bls _0222D696 - bl sub_02022974 + bl GF_AssertFail _0222D696: cmp r4, #0x40 bls _0222D69E - bl sub_02022974 + bl GF_AssertFail _0222D69E: cmp r5, #0x20 bhi _0222D6AE @@ -775,8 +775,8 @@ _0222D76C: add r0, r0, r2 pop {r4, r5, r6, pc} _0222D770: - bl sub_02022974 - bl sub_02022974 + bl GF_AssertFail + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} thumb_func_end ov63_0222D6BC diff --git a/asm/ov63_0222D77C.s b/asm/ov63_0222D77C.s index face70cad8..3f555ceaac 100644 --- a/asm/ov63_0222D77C.s +++ b/asm/ov63_0222D77C.s @@ -16,7 +16,7 @@ ov63_0222D77C: ; 0x0222D77C bl sub_02018144 add r4, r0, #0 bne _0222D792 - bl sub_02022974 + bl GF_AssertFail _0222D792: add r1, r5, #1 str r1, [r4, #4] @@ -127,7 +127,7 @@ ov63_0222D848: ; 0x0222D848 bl sub_02018144 add r4, r0, #0 bne _0222D85E - bl sub_02022974 + bl GF_AssertFail _0222D85E: add r1, r5, #1 str r1, [r4, #4] diff --git a/asm/ov64_0222DCE0.s b/asm/ov64_0222DCE0.s index c5d93d62a0..9691941072 100644 --- a/asm/ov64_0222DCE0.s +++ b/asm/ov64_0222DCE0.s @@ -557,7 +557,7 @@ _0222E148: add r4, r4, #1 cmp r4, #0x20 blt _0222E0BC - bl sub_02022974 + bl GF_AssertFail mov r0, #0 add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} @@ -1013,7 +1013,7 @@ _0222E44E: bl sub_0200A3DC cmp r0, #0 bne _0222E4F8 - bl sub_02022974 + bl GF_AssertFail _0222E4F8: mov r0, #0x76 lsl r0, r0, #2 @@ -1021,7 +1021,7 @@ _0222E4F8: bl sub_0200A640 cmp r0, #0 bne _0222E50A - bl sub_02022974 + bl GF_AssertFail _0222E50A: mov r0, #0x75 lsl r0, r0, #2 diff --git a/asm/ov65_0222DCE0.s b/asm/ov65_0222DCE0.s index 08e5d77da1..1b9da5b82e 100644 --- a/asm/ov65_0222DCE0.s +++ b/asm/ov65_0222DCE0.s @@ -152,7 +152,7 @@ _0222DDC8: mov r0, #0xe pop {r3, pc} _0222DDCC: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} thumb_func_end ov65_0222DD94 @@ -640,7 +640,7 @@ _0222E124: ldr r0, [sp, #0x18] cmp r0, #0x15 blt _0222E12E - bl sub_02022974 + bl GF_AssertFail _0222E12E: ldr r0, [sp, #0x24] mov r7, #1 @@ -962,7 +962,7 @@ _0222E3CA: bl sub_0201E450 cmp r0, #1 beq _0222E3D8 - bl sub_02022974 + bl GF_AssertFail _0222E3D8: ldr r0, [r6, #0] add r0, r0, #1 @@ -1531,7 +1531,7 @@ _0222E894: add r5, r5, #4 cmp r4, #0x21 blt _0222E884 - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} nop _0222E8A4: .word 0x00000A84 @@ -1558,7 +1558,7 @@ _0222E8C2: add r5, r5, #4 cmp r4, #0x21 blt _0222E8B0 - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} ; .align 2, 0 _0222E8D0: .word 0x00000A84 @@ -2738,7 +2738,7 @@ _0222F1C6: ldr r0, [r5, r0] cmp r0, #0 beq _0222F1F0 - bl sub_02022974 + bl GF_AssertFail _0222F1F0: mov r1, #0xb3 lsl r1, r1, #2 @@ -2953,7 +2953,7 @@ _0222F324: ldr r0, [r5, r0] cmp r0, #0 beq _0222F3B0 - bl sub_02022974 + bl GF_AssertFail _0222F3B0: mov r1, #0xb3 lsl r1, r1, #2 @@ -3040,7 +3040,7 @@ _0222F3FC: ldr r0, [r5, r0] cmp r0, #0 beq _0222F464 - bl sub_02022974 + bl GF_AssertFail _0222F464: mov r1, #0xb3 lsl r1, r1, #2 @@ -3813,7 +3813,7 @@ _0222FA16: ldr r0, [r5, r0] cmp r0, #0 beq _0222FA72 - bl sub_02022974 + bl GF_AssertFail _0222FA72: mov r1, #0xb3 lsl r1, r1, #2 @@ -3869,7 +3869,7 @@ _0222FABC: ldr r0, [r5, r0] cmp r0, #0 beq _0222FAE4 - bl sub_02022974 + bl GF_AssertFail _0222FAE4: mov r1, #0xb3 lsl r1, r1, #2 @@ -5222,7 +5222,7 @@ _022305C6: add r0, r5, #0 pop {r3, r4, r5, r6, r7, pc} _022305D8: - bl sub_02022974 + bl GF_AssertFail add r0, r5, #0 pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -7182,7 +7182,7 @@ ov65_022315A4: ; 0x022315A4 bl ov65_0222E8D4 add r7, r0, #0 bne _022315C6 - bl sub_02022974 + bl GF_AssertFail _022315C6: add r0, r4, #0 add r1, r5, #0 @@ -8154,7 +8154,7 @@ _02231D34: ldr r0, [r5, r0] cmp r0, #0 beq _02231D8E - bl sub_02022974 + bl GF_AssertFail _02231D8E: mov r1, #0xb3 lsl r1, r1, #2 @@ -9554,7 +9554,7 @@ _02232814: ldr r0, [r5, r0] cmp r0, #0 beq _02232830 - bl sub_02022974 + bl GF_AssertFail _02232830: mov r1, #0xb3 lsl r1, r1, #2 @@ -9859,7 +9859,7 @@ _02232A46: ldr r0, [r5, r0] cmp r0, #0 beq _02232ABE - bl sub_02022974 + bl GF_AssertFail _02232ABE: mov r1, #0xb3 lsl r1, r1, #2 @@ -11315,15 +11315,15 @@ ov65_02233638: ; 0x02233638 add r4, r2, #0 cmp r6, #0 bne _02233648 - bl sub_02022974 + bl GF_AssertFail _02233648: cmp r4, #0 bne _02233650 - bl sub_02022974 + bl GF_AssertFail _02233650: cmp r4, #3 blo _02233658 - bl sub_02022974 + bl GF_AssertFail _02233658: ldr r0, _02233668 ; =0x00000B67 add r1, r5, r6 @@ -11342,7 +11342,7 @@ ov65_0223366C: ; 0x0223366C add r5, r0, #0 add r4, r1, #0 bne _02233678 - bl sub_02022974 + bl GF_AssertFail _02233678: ldr r0, _02233688 ; =0x00000B67 mov r2, #0 @@ -11362,7 +11362,7 @@ ov65_0223368C: ; 0x0223368C add r5, r0, #0 add r4, r1, #0 bne _02233698 - bl sub_02022974 + bl GF_AssertFail _02233698: ldr r0, _022336A0 ; =0x00000B67 add r1, r5, r4 @@ -13303,7 +13303,7 @@ ov65_022346C4: ; 0x022346C4 add r7, r3, #0 cmp r4, #6 blo _022346D6 - bl sub_02022974 + bl GF_AssertFail _022346D6: mov r0, #0x16 lsl r0, r0, #4 @@ -13402,7 +13402,7 @@ ov65_02234788: ; 0x02234788 add r6, r3, #0 cmp r4, #4 blo _0223479E - bl sub_02022974 + bl GF_AssertFail _0223479E: cmp r4, #3 bne _022347A4 @@ -13874,14 +13874,14 @@ _02234A78: bl sub_0200A450 cmp r0, #0 bne _02234B1E - bl sub_02022974 + bl GF_AssertFail _02234B1E: ldr r0, _02234CD4 ; =0x00000D28 ldr r0, [r5, r0] bl sub_0200A640 cmp r0, #0 bne _02234B2E - bl sub_02022974 + bl GF_AssertFail _02234B2E: ldr r0, _02234CD0 ; =0x00000D24 ldr r0, [r5, r0] @@ -14013,7 +14013,7 @@ _02234B86: bl sub_0201ED94 cmp r0, #0 bne _02234C54 - bl sub_02022974 + bl GF_AssertFail _02234C54: mov r0, #0xb2 lsl r0, r0, #2 @@ -14436,7 +14436,7 @@ ov65_02234FA8: ; 0x02234FA8 add r5, r0, #0 cmp r4, #0x20 blo _02234FB6 - bl sub_02022974 + bl GF_AssertFail _02234FB6: ldr r1, [r5, #4] mov r0, #0x24 diff --git a/asm/ov65_02235060.s b/asm/ov65_02235060.s index aea824a33b..bc790d07e9 100644 --- a/asm/ov65_02235060.s +++ b/asm/ov65_02235060.s @@ -239,7 +239,7 @@ ov65_02235254: ; 0x02235254 ldr r0, [r4, r0] cmp r0, #0 bne _02235264 - bl sub_02022974 + bl GF_AssertFail _02235264: ldr r0, _0223526C ; =0x000006CC ldr r0, [r4, r0] @@ -258,7 +258,7 @@ ov65_02235270: ; 0x02235270 ldr r0, [r4, r0] cmp r0, #0 bne _02235282 - bl sub_02022974 + bl GF_AssertFail _02235282: ldr r0, _022352C4 ; =0x000006CC ldr r0, [r4, r0] @@ -305,7 +305,7 @@ ov65_022352CC: ; 0x022352CC ldr r0, [r4, r0] cmp r0, #0 bne _022352DE - bl sub_02022974 + bl GF_AssertFail _022352DE: ldr r0, _02235324 ; =0x000006CC ldr r0, [r4, r0] @@ -702,7 +702,7 @@ ov65_022355B0: ; 0x022355B0 cmp r4, #4 blt _022355D6 _022355D2: - bl sub_02022974 + bl GF_AssertFail _022355D6: mov r0, #0x6d lsl r0, r0, #4 @@ -712,7 +712,7 @@ _022355D6: bl ov65_02236440 pop {r3, r4, r5, pc} _022355E6: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} thumb_func_end ov65_022355B0 @@ -1294,7 +1294,7 @@ ov65_02235960: ; 0x02235960 bl sub_0200A3DC cmp r0, #1 beq _022359F4 - bl sub_02022974 + bl GF_AssertFail _022359F4: mov r0, #5 lsl r0, r0, #6 @@ -1302,7 +1302,7 @@ _022359F4: bl sub_0200A640 cmp r0, #1 beq _02235A06 - bl sub_02022974 + bl GF_AssertFail _02235A06: mov r0, #0x4f lsl r0, r0, #2 @@ -1698,7 +1698,7 @@ _02235CF0: cmp r1, r0 blo _02235C9A _02235CFC: - bl sub_02022974 + bl GF_AssertFail add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -1761,7 +1761,7 @@ _02235D64: cmp r1, r0 blo _02235D2E _02235D70: - bl sub_02022974 + bl GF_AssertFail add sp, #0xc pop {r4, r5, r6, r7, pc} ; .align 2, 0 @@ -1791,7 +1791,7 @@ _02235D9A: add r4, #0x1c cmp r1, #0x30 blt _02235D86 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} ; .align 2, 0 @@ -2472,7 +2472,7 @@ _022362A0: bl ov65_02235EC8 b _022362AA _022362A6: - bl sub_02022974 + bl GF_AssertFail _022362AA: strb r4, [r5, #0xb] pop {r3, r4, r5, pc} diff --git a/asm/ov65_0223648C.s b/asm/ov65_0223648C.s index 0acbd81a1f..d80e15851f 100644 --- a/asm/ov65_0223648C.s +++ b/asm/ov65_0223648C.s @@ -18,7 +18,7 @@ ov65_0223648C: ; 0x0223648C bl sub_020389B8 cmp r0, #1 beq _022364AA - bl sub_02022974 + bl GF_AssertFail _022364AA: mov r1, #0x60 mov r0, #3 @@ -1789,7 +1789,7 @@ ov65_022372EC: ; 0x022372EC bl sub_0201DC68 cmp r0, #0 bne _02237314 - bl sub_02022974 + bl GF_AssertFail _02237314: pop {r4, pc} nop @@ -2174,7 +2174,7 @@ _0223759C: bl sub_020359DC cmp r0, #1 beq _022375BA - bl sub_02022974 + bl GF_AssertFail _022375BA: add r0, r5, #0 bl sub_02032D98 @@ -2209,7 +2209,7 @@ _022375DC: bl sub_020359DC cmp r0, #1 beq _022375FA - bl sub_02022974 + bl GF_AssertFail _022375FA: add r0, r5, #0 bl sub_02032D98 @@ -2387,7 +2387,7 @@ ov65_022376D0: ; 0x022376D0 bl sub_02032EE8 add r6, r0, #0 bne _02237720 - bl sub_02022974 + bl GF_AssertFail _02237720: add r0, r6, #0 bl sub_02025F8C @@ -2525,7 +2525,7 @@ ov65_02237808: ; 0x02237808 bl sub_020359DC cmp r0, #1 beq _02237826 - bl sub_02022974 + bl GF_AssertFail _02237826: add sp, #8 pop {r3, pc} @@ -2604,7 +2604,7 @@ ov65_0223789C: ; 0x0223789C ldr r0, [r4, r0] cmp r0, #0 beq _022378AE - bl sub_02022974 + bl GF_AssertFail _022378AE: mov r0, #0x6f lsl r0, r0, #2 @@ -2753,7 +2753,7 @@ _022379B0: add r6, r0, #0 cmp r6, #0x20 bne _022379C0 - bl sub_02022974 + bl GF_AssertFail _022379C0: mov r0, #0x24 ldr r1, [r5, #0] @@ -2945,7 +2945,7 @@ _02237AD8: bl sub_020359DC cmp r0, #1 beq _02237B1E - bl sub_02022974 + bl GF_AssertFail b _02237B1E _02237B1C: strb r4, [r5, #6] @@ -3127,7 +3127,7 @@ _02237C6A: bl sub_020359DC cmp r0, #1 beq _02237C7C - bl sub_02022974 + bl GF_AssertFail _02237C7C: mov r0, #0xff strb r0, [r5, #6] @@ -4588,7 +4588,7 @@ ov65_022386D0: ; 0x022386D0 ldrb r0, [r0] cmp r0, #0x20 bne _022386F4 - bl sub_02022974 + bl GF_AssertFail _022386F4: add r0, r5, #0 mov r2, #0 diff --git a/asm/ov66_0222DDF0.s b/asm/ov66_0222DDF0.s index 2dc640f361..e037fc74d1 100644 --- a/asm/ov66_0222DDF0.s +++ b/asm/ov66_0222DDF0.s @@ -387,7 +387,7 @@ ov66_0222E0C8: ; 0x0222E0C8 push {r3, lr} cmp r0, #0 bne _0222E0D2 - bl sub_02022974 + bl GF_AssertFail _0222E0D2: mov r0, #4 bl ov66_02232BEC @@ -400,7 +400,7 @@ ov66_0222E0DC: ; 0x0222E0DC push {r4, lr} add r4, r0, #0 bne _0222E0E6 - bl sub_02022974 + bl GF_AssertFail _0222E0E6: ldr r0, _0222E0F0 ; =0x0000020B ldrb r0, [r4, r0] @@ -416,7 +416,7 @@ ov66_0222E0F4: ; 0x0222E0F4 push {r4, lr} add r4, r0, #0 bne _0222E0FE - bl sub_02022974 + bl GF_AssertFail _0222E0FE: ldr r0, _0222E108 ; =0x0000020B ldrb r0, [r4, r0] @@ -658,7 +658,7 @@ ov66_0222E24C: ; 0x0222E24C add r6, r1, #0 cmp r4, #4 blo _0222E25C - bl sub_02022974 + bl GF_AssertFail _0222E25C: add r0, r6, #0 bl ov66_02232B78 @@ -667,7 +667,7 @@ _0222E25C: mvn r0, r0 cmp r6, r0 bne _0222E270 - bl sub_02022974 + bl GF_AssertFail _0222E270: mov r0, #0x3e add r1, r5, r4 @@ -837,7 +837,7 @@ ov66_0222E374: ; 0x0222E374 add r4, r0, #0 cmp r5, #0x14 blo _0222E384 - bl sub_02022974 + bl GF_AssertFail _0222E384: add r0, sp, #0 bl ov66_02232B20 @@ -898,7 +898,7 @@ ov66_0222E3E4: ; 0x0222E3E4 add r4, r0, #0 cmp r5, #0xf blt _0222E3F2 - bl sub_02022974 + bl GF_AssertFail _0222E3F2: mov r0, #0x42 lsl r0, r0, #2 @@ -1041,7 +1041,7 @@ ov66_0222E500: ; 0x0222E500 add r6, r2, #0 cmp r4, #0x18 blt _0222E510 - bl sub_02022974 + bl GF_AssertFail _0222E510: ldr r0, _0222E524 ; =0x000004BC add r1, r4, #0 @@ -1062,7 +1062,7 @@ ov66_0222E528: ; 0x0222E528 add r5, r0, #0 cmp r4, #0x1b blo _0222E536 - bl sub_02022974 + bl GF_AssertFail _0222E536: mov r0, #0x42 lsl r0, r0, #2 @@ -1098,11 +1098,11 @@ ov66_0222E56C: ; 0x0222E56C add r6, r2, #0 cmp r4, #0x12 blt _0222E57C - bl sub_02022974 + bl GF_AssertFail _0222E57C: cmp r6, #0x12 blt _0222E584 - bl sub_02022974 + bl GF_AssertFail _0222E584: mov r0, #0x42 lsl r0, r0, #2 @@ -1157,7 +1157,7 @@ ov66_0222E5D8: ; 0x0222E5D8 add r6, r1, #0 cmp r4, #3 blo _0222E5E8 - bl sub_02022974 + bl GF_AssertFail _0222E5E8: mov r0, #0x42 lsl r0, r0, #2 @@ -1316,7 +1316,7 @@ ov66_0222E728: ; 0x0222E728 add r5, r0, #0 cmp r4, #0xc blo _0222E736 - bl sub_02022974 + bl GF_AssertFail _0222E736: mov r1, #0 add r2, r1, #0 @@ -1351,7 +1351,7 @@ ov66_0222E760: ; 0x0222E760 add r5, r0, #0 cmp r4, #0xc blo _0222E76E - bl sub_02022974 + bl GF_AssertFail _0222E76E: mov r1, #0 add r2, r1, #0 @@ -1615,7 +1615,7 @@ ov66_0222E8E8: ; 0x0222E8E8 add r4, r0, #0 cmp r5, #2 blo _0222E8F6 - bl sub_02022974 + bl GF_AssertFail _0222E8F6: lsl r0, r5, #1 add r0, r4, r0 @@ -1976,7 +1976,7 @@ ov66_0222EB54: ; 0x0222EB54 add r5, r0, #0 cmp r4, #0x14 blo _0222EB62 - bl sub_02022974 + bl GF_AssertFail _0222EB62: mov r0, #0x7a add r1, r5, r4 @@ -2433,7 +2433,7 @@ ov66_0222EE44: ; 0x0222EE44 add r5, r0, #0 cmp r4, #0x14 blo _0222EE52 - bl sub_02022974 + bl GF_AssertFail _0222EE52: mov r0, #0x73 add r1, r5, r4 @@ -2720,7 +2720,7 @@ ov66_0222F040: ; 0x0222F040 add r5, r0, #0 cmp r4, #8 blt _0222F04E - bl sub_02022974 + bl GF_AssertFail _0222F04E: mov r0, #0xe9 mov r2, #1 @@ -2902,7 +2902,7 @@ ov66_0222F16C: ; 0x0222F16C ldr r0, [r4, r0] cmp r0, #0 beq _0222F17C - bl sub_02022974 + bl GF_AssertFail _0222F17C: ldr r0, [r4, #0] bl sub_02025E38 @@ -3986,7 +3986,7 @@ ov66_0222FA04: ; 0x0222FA04 ldr r1, [r4, #0] cmp r0, r1 beq _0222FA24 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} _0222FA24: @@ -4381,7 +4381,7 @@ ov66_0222FC9C: ; 0x0222FC9C add r5, r0, #0 cmp r4, #0x14 blo _0222FCAA - bl sub_02022974 + bl GF_AssertFail _0222FCAA: mov r0, #1 add r1, r0, #0 @@ -4402,7 +4402,7 @@ ov66_0222FCBC: ; 0x0222FCBC add r5, r0, #0 cmp r4, #0x14 blo _0222FCCA - bl sub_02022974 + bl GF_AssertFail _0222FCCA: mov r0, #1 ldr r1, [r5, #0] @@ -4420,7 +4420,7 @@ ov66_0222FCD8: ; 0x0222FCD8 add r5, r0, #0 cmp r4, #0x14 blo _0222FCE6 - bl sub_02022974 + bl GF_AssertFail _0222FCE6: mov r0, #1 lsl r0, r4 @@ -4438,7 +4438,7 @@ ov66_0222FCF4: ; 0x0222FCF4 add r5, r0, #0 cmp r4, #0x14 blo _0222FD02 - bl sub_02022974 + bl GF_AssertFail _0222FD02: add r5, #0xc ldrb r0, [r5, r4] @@ -4457,7 +4457,7 @@ ov66_0222FD10: ; 0x0222FD10 add r5, r0, #0 cmp r4, #0x14 blo _0222FD1E - bl sub_02022974 + bl GF_AssertFail _0222FD1E: mov r1, #0 add r0, r5, r4 @@ -5391,7 +5391,7 @@ ov66_022303DC: ; 0x022303DC add r5, r0, #0 cmp r4, #0x1b blo _022303EA - bl sub_02022974 + bl GF_AssertFail _022303EA: add r0, r4, #0 mov r1, #3 @@ -5417,7 +5417,7 @@ ov66_0223040C: ; 0x0223040C add r4, r0, #0 cmp r5, #9 blo _0223041A - bl sub_02022974 + bl GF_AssertFail _0223041A: lsl r0, r5, #2 add r0, r4, r0 @@ -5433,7 +5433,7 @@ ov66_02230424: ; 0x02230424 add r4, r0, #0 cmp r5, #9 blo _02230432 - bl sub_02022974 + bl GF_AssertFail _02230432: lsl r0, r5, #2 add r0, r4, r0 @@ -5479,7 +5479,7 @@ ov66_02230474: ; 0x02230474 add r5, r0, #0 cmp r4, #0x1b blo _02230482 - bl sub_02022974 + bl GF_AssertFail _02230482: add r0, r4, #0 mov r1, #3 @@ -5507,7 +5507,7 @@ ov66_022304A8: ; 0x022304A8 add r5, r0, #0 cmp r4, #0x1b blo _022304B6 - bl sub_02022974 + bl GF_AssertFail _022304B6: add r0, r4, #0 mov r1, #3 @@ -5569,7 +5569,7 @@ ov66_02230510: ; 0x02230510 add r6, r2, #0 cmp r4, #0x1b blo _02230520 - bl sub_02022974 + bl GF_AssertFail _02230520: add r0, r4, #0 mov r1, #3 @@ -5597,7 +5597,7 @@ ov66_02230544: ; 0x02230544 add r6, r2, #0 cmp r4, #0x1b blo _02230554 - bl sub_02022974 + bl GF_AssertFail _02230554: add r0, r4, #0 mov r1, #3 @@ -5629,7 +5629,7 @@ ov66_02230580: ; 0x02230580 add r5, r0, #0 cmp r4, #0x1b blo _0223058E - bl sub_02022974 + bl GF_AssertFail _0223058E: add r0, r4, #0 mov r1, #3 @@ -5968,11 +5968,11 @@ ov66_022307F0: ; 0x022307F0 add r6, r1, #0 cmp r4, #0x14 blo _02230800 - bl sub_02022974 + bl GF_AssertFail _02230800: cmp r6, #0x1b blo _02230808 - bl sub_02022974 + bl GF_AssertFail _02230808: add r7, r5, #0 add r7, #0xc @@ -6025,7 +6025,7 @@ _0223085A: add r3, r3, r2 cmp r0, #9 blt _02230848 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} thumb_func_end ov66_02230828 @@ -6038,7 +6038,7 @@ ov66_0223086C: ; 0x0223086C add r6, r2, #0 cmp r4, #0x14 blo _0223087C - bl sub_02022974 + bl GF_AssertFail _0223087C: cmp r4, #0x14 bhs _02230882 @@ -6054,7 +6054,7 @@ ov66_02230884: ; 0x02230884 add r5, r0, #0 cmp r4, #0x14 blo _02230892 - bl sub_02022974 + bl GF_AssertFail _02230892: cmp r4, #0x14 bhs _0223089A @@ -6101,7 +6101,7 @@ ov66_022308C8: ; 0x022308C8 add r7, r3, #0 cmp r4, #0x14 blo _022308DA - bl sub_02022974 + bl GF_AssertFail _022308DA: cmp r4, #0x14 bhs _022308F6 @@ -6127,7 +6127,7 @@ ov66_022308F8: ; 0x022308F8 add r5, r0, #0 cmp r4, #0x14 blo _02230906 - bl sub_02022974 + bl GF_AssertFail _02230906: cmp r4, #0x14 bhs _0223090E @@ -6146,7 +6146,7 @@ ov66_02230914: ; 0x02230914 add r5, r0, #0 cmp r4, #0x14 blo _02230922 - bl sub_02022974 + bl GF_AssertFail _02230922: cmp r4, #0x14 bhs _02230934 @@ -6484,7 +6484,7 @@ ov66_02230B78: ; 0x02230B78 add r5, r0, #0 cmp r4, #0xc blo _02230B86 - bl sub_02022974 + bl GF_AssertFail _02230B86: add r0, r5, #0 bl ov66_02230BE0 @@ -6510,7 +6510,7 @@ ov66_02230BA4: ; 0x02230BA4 add r5, r0, #0 cmp r4, #0xc blo _02230BB2 - bl sub_02022974 + bl GF_AssertFail _02230BB2: add r0, r5, #0 bl ov66_02230BE0 @@ -6553,7 +6553,7 @@ ov66_02230BE0: ; 0x02230BE0 ldrh r1, [r1] cmp r0, r1 beq _02230C02 - bl sub_02022974 + bl GF_AssertFail mov r0, #1 add r4, #0x4a strh r0, [r4] diff --git a/asm/ov66_02230C44.s b/asm/ov66_02230C44.s index f12c1ef622..1ef36a7d16 100644 --- a/asm/ov66_02230C44.s +++ b/asm/ov66_02230C44.s @@ -113,7 +113,7 @@ ov66_02230CEC: ; 0x02230CEC add r6, r2, #0 cmp r0, #0 beq _02230CFE - bl sub_02022974 + bl GF_AssertFail _02230CFE: ldrh r2, [r5, #0x3a] ldr r1, [r4, #0] @@ -131,7 +131,7 @@ ov66_02230D0C: ; 0x02230D0C add r6, r2, #0 cmp r4, #0xd blo _02230D1C - bl sub_02022974 + bl GF_AssertFail _02230D1C: lsl r3, r4, #2 add r1, r5, #4 @@ -153,7 +153,7 @@ ov66_02230D34: ; 0x02230D34 add r4, r0, #0 cmp r5, #0xd blo _02230D42 - bl sub_02022974 + bl GF_AssertFail _02230D42: ldr r1, _02230D50 ; =0x02258D20 lsl r2, r5, #2 @@ -173,7 +173,7 @@ ov66_02230D54: ; 0x02230D54 add r5, r0, #0 cmp r4, #0xd blo _02230D62 - bl sub_02022974 + bl GF_AssertFail _02230D62: ldr r2, _02230D78 ; =0x02258D54 lsl r3, r4, #2 @@ -196,7 +196,7 @@ ov66_02230D7C: ; 0x02230D7C add r4, r0, #0 cmp r5, #0xd blo _02230D8A - bl sub_02022974 + bl GF_AssertFail _02230D8A: ldr r2, _02230D9C ; =0x02258DBC lsl r3, r5, #2 @@ -313,7 +313,7 @@ ov66_02230E4C: ; 0x02230E4C ldr r0, [r4, #0] cmp r0, #0 bne _02230E5A - bl sub_02022974 + bl GF_AssertFail _02230E5A: ldr r0, [r4, #0] bl sub_020181C4 @@ -414,7 +414,7 @@ _02230F0C: bl ov66_02230D54 b _02230F18 _02230F14: - bl sub_02022974 + bl GF_AssertFail _02230F18: mov r0, #0 pop {r3, pc} diff --git a/asm/ov66_02231428.s b/asm/ov66_02231428.s index 22e47b5598..2c8d1bdd18 100644 --- a/asm/ov66_02231428.s +++ b/asm/ov66_02231428.s @@ -243,7 +243,7 @@ ov66_022315D8: ; 0x022315D8 add r4, r0, #0 cmp r5, #0x32 blo _022315E6 - bl sub_02022974 + bl GF_AssertFail _022315E6: lsl r0, r5, #2 add r4, r4, r0 @@ -252,7 +252,7 @@ _022315E6: lsr r0, r0, #0x1c cmp r0, #1 beq _022315F8 - bl sub_02022974 + bl GF_AssertFail _022315F8: ldrh r0, [r4] pop {r3, r4, r5, pc} @@ -265,7 +265,7 @@ ov66_022315FC: ; 0x022315FC add r5, r0, #0 cmp r4, #0x32 blo _0223160A - bl sub_02022974 + bl GF_AssertFail _0223160A: lsl r4, r4, #2 add r0, r5, r4 @@ -274,7 +274,7 @@ _0223160A: lsr r0, r0, #0x1c cmp r0, #1 beq _0223161C - bl sub_02022974 + bl GF_AssertFail _0223161C: add r0, r5, r4 ldrb r0, [r0, #2] @@ -289,7 +289,7 @@ ov66_02231624: ; 0x02231624 add r4, r0, #0 cmp r5, #0x32 blo _02231632 - bl sub_02022974 + bl GF_AssertFail _02231632: lsl r0, r5, #2 add r4, r4, r0 @@ -298,7 +298,7 @@ _02231632: lsr r0, r0, #0x1c cmp r0, #1 beq _02231644 - bl sub_02022974 + bl GF_AssertFail _02231644: ldrb r0, [r4, #3] lsl r0, r0, #0x1c @@ -313,7 +313,7 @@ ov66_0223164C: ; 0x0223164C add r4, r0, #0 cmp r5, #0x32 blo _0223165A - bl sub_02022974 + bl GF_AssertFail _0223165A: lsl r0, r5, #2 add r0, r4, r0 diff --git a/asm/ov66_0223177C.s b/asm/ov66_0223177C.s index 1405dc53fe..518a4eca42 100644 --- a/asm/ov66_0223177C.s +++ b/asm/ov66_0223177C.s @@ -717,7 +717,7 @@ ov66_02231C78: ; 0x02231C78 bl ov66_02231C60 cmp r0, #0 bne _02231C88 - bl sub_02022974 + bl GF_AssertFail _02231C88: mov r0, #0x8a lsl r0, r0, #2 @@ -737,7 +737,7 @@ ov66_02231C94: ; 0x02231C94 bl ov66_02231C60 cmp r0, #0 bne _02231CAA - bl sub_02022974 + bl GF_AssertFail _02231CAA: mov r2, #0x8a lsl r2, r2, #2 @@ -789,7 +789,7 @@ ov66_02231D00: ; 0x02231D00 bl ov66_02231C60 cmp r0, #0 bne _02231D12 - bl sub_02022974 + bl GF_AssertFail _02231D12: mov r0, #0x8a lsl r0, r0, #2 @@ -804,7 +804,7 @@ _02231D12: blx r2 pop {r3, r4, r5, pc} _02231D2A: - bl sub_02022974 + bl GF_AssertFail mov r0, #0x14 pop {r3, r4, r5, pc} nop @@ -840,7 +840,7 @@ ov66_02231D58: ; 0x02231D58 add r7, r3, #0 cmp r4, #0x14 blo _02231D6A - bl sub_02022974 + bl GF_AssertFail _02231D6A: lsl r0, r4, #2 strh r6, [r5, r0] @@ -886,7 +886,7 @@ ov66_02231DA8: ; 0x02231DA8 add r6, r2, #0 cmp r4, #0x14 blo _02231DB8 - bl sub_02022974 + bl GF_AssertFail _02231DB8: lsl r0, r4, #2 add r0, r5, r0 @@ -901,7 +901,7 @@ ov66_02231DC0: ; 0x02231DC0 add r5, r0, #0 cmp r4, #2 ble _02231DCE - bl sub_02022974 + bl GF_AssertFail _02231DCE: add r5, #0x50 strh r4, [r5] @@ -915,7 +915,7 @@ ov66_02231DD4: ; 0x02231DD4 add r5, r0, #0 cmp r4, #0x14 blo _02231DE2 - bl sub_02022974 + bl GF_AssertFail _02231DE2: add r5, #0x52 strh r4, [r5] @@ -943,7 +943,7 @@ ov66_02231DFC: ; 0x02231DFC add r4, r0, #0 cmp r5, #0x14 blo _02231E0A - bl sub_02022974 + bl GF_AssertFail _02231E0A: lsl r0, r5, #2 ldrh r0, [r4, r0] @@ -957,7 +957,7 @@ ov66_02231E10: ; 0x02231E10 add r4, r0, #0 cmp r5, #0x14 blo _02231E1E - bl sub_02022974 + bl GF_AssertFail _02231E1E: lsl r0, r5, #2 add r0, r4, r0 @@ -978,7 +978,7 @@ ov66_02231E30: ; 0x02231E30 add r4, r0, #0 cmp r5, #0x14 blo _02231E3E - bl sub_02022974 + bl GF_AssertFail _02231E3E: lsl r0, r5, #2 add r0, r4, r0 @@ -1001,7 +1001,7 @@ ov66_02231E54: ; 0x02231E54 add r4, r0, #0 cmp r5, #0x14 blo _02231E62 - bl sub_02022974 + bl GF_AssertFail _02231E62: lsl r0, r5, #2 add r0, r4, r0 @@ -1025,7 +1025,7 @@ ov66_02231E74: ; 0x02231E74 add r5, r0, #0 cmp r4, #0x14 blo _02231E82 - bl sub_02022974 + bl GF_AssertFail _02231E82: add r5, #0x52 ldrh r0, [r5] @@ -1269,7 +1269,7 @@ ov66_02231FFC: ; 0x02231FFC add r7, r3, #0 cmp r0, #9 blo _02232010 - bl sub_02022974 + bl GF_AssertFail _02232010: ldr r0, [sp, #0x40] strb r0, [r5] diff --git a/asm/ov66_022324F0.s b/asm/ov66_022324F0.s index f60821fd74..612f0974fc 100644 --- a/asm/ov66_022324F0.s +++ b/asm/ov66_022324F0.s @@ -17,13 +17,13 @@ ov66_022324F0: ; 0x022324F0 add r4, r3, #0 cmp r0, #0 beq _02232506 - bl sub_02022974 + bl GF_AssertFail _02232506: mov r0, #0x4b lsl r0, r0, #2 cmp r7, r0 blo _02232512 - bl sub_02022974 + bl GF_AssertFail _02232512: ldr r1, _02232594 ; =0x00000988 add r0, r5, #0 @@ -91,7 +91,7 @@ ov66_02232598: ; 0x02232598 ldr r0, [r0, #0] cmp r0, #0 bne _022325A6 - bl sub_02022974 + bl GF_AssertFail _022325A6: ldr r0, _022325D4 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -264,7 +264,7 @@ ov66_022326DC: ; 0x022326DC ldr r0, [r0, #0] cmp r0, #0 bne _022326EA - bl sub_02022974 + bl GF_AssertFail _022326EA: ldr r0, _02232704 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -309,7 +309,7 @@ ov66_02232720: ; 0x02232720 ldr r0, [r0, #0] cmp r0, #0 bne _02232734 - bl sub_02022974 + bl GF_AssertFail _02232734: ldr r0, _022327B4 ; =ov66_02233B54 str r0, [sp, #0xc] @@ -400,7 +400,7 @@ ov66_02232804: ; 0x02232804 ldr r0, [r0, #0] cmp r0, #0 bne _02232812 - bl sub_02022974 + bl GF_AssertFail _02232812: ldr r0, _02232828 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -425,14 +425,14 @@ ov66_0223282C: ; 0x0223282C ldr r0, [r0, #0] cmp r0, #0 bne _0223283A - bl sub_02022974 + bl GF_AssertFail _0223283A: bl ov66_0223369C blx ov66_022353A4 bl ov66_0223365C cmp r0, #0 bne _0223284E - bl sub_02022974 + bl GF_AssertFail _0223284E: pop {r3, pc} ; .align 2, 0 @@ -446,7 +446,7 @@ ov66_02232854: ; 0x02232854 ldr r0, [r0, #0] cmp r0, #0 bne _02232862 - bl sub_02022974 + bl GF_AssertFail _02232862: ldr r0, _02232878 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -471,7 +471,7 @@ ov66_0223287C: ; 0x0223287C ldr r0, [r0, #0] cmp r0, #0 bne _0223288A - bl sub_02022974 + bl GF_AssertFail _0223288A: ldr r0, _022328C0 ; =0x0225B6C0 ldr r1, _022328C4 ; =0x0000012D @@ -516,7 +516,7 @@ ov66_022328CC: ; 0x022328CC ldr r0, [r0, #0] cmp r0, #0 bne _022328DA - bl sub_02022974 + bl GF_AssertFail _022328DA: ldr r0, _022328E8 ; =0x0225B6C0 ldr r1, _022328EC ; =0x00000131 @@ -537,7 +537,7 @@ ov66_022328F0: ; 0x022328F0 ldr r0, [r0, #0] cmp r0, #0 bne _022328FE - bl sub_02022974 + bl GF_AssertFail _022328FE: blx ov66_02236494 pop {r3, pc} @@ -553,7 +553,7 @@ ov66_02232908: ; 0x02232908 ldr r0, [r0, #0] cmp r0, #0 bne _02232918 - bl sub_02022974 + bl GF_AssertFail _02232918: blx ov66_02236494 add r1, r0, #0 @@ -580,7 +580,7 @@ ov66_0223293C: ; 0x0223293C ldr r0, [r0, #0] cmp r0, #0 bne _0223294C - bl sub_02022974 + bl GF_AssertFail _0223294C: ldr r0, _02232958 ; =0x0225B6C0 add r1, r4, #0 @@ -600,7 +600,7 @@ ov66_0223295C: ; 0x0223295C ldr r0, [r0, #0] cmp r0, #0 bne _0223296E - bl sub_02022974 + bl GF_AssertFail _0223296E: ldr r0, _02232984 ; =0x0225B6C0 add r1, r5, #0 @@ -628,7 +628,7 @@ ov66_02232988: ; 0x02232988 ldr r0, [r0, #0] cmp r0, #0 bne _022329A2 - bl sub_02022974 + bl GF_AssertFail _022329A2: mov r4, #0 _022329A4: @@ -679,7 +679,7 @@ ov66_022329E4: ; 0x022329E4 ldr r0, [r0, #0] cmp r0, #0 bne _02232A00 - bl sub_02022974 + bl GF_AssertFail _02232A00: mov r4, #0 _02232A02: @@ -727,7 +727,7 @@ ov66_02232A48: ; 0x02232A48 ldr r0, [r0, #0] cmp r0, #0 bne _02232A58 - bl sub_02022974 + bl GF_AssertFail _02232A58: add r0, r4, #0 bl ov66_022336C0 @@ -757,7 +757,7 @@ ov66_02232A84: ; 0x02232A84 ldr r0, [r0, #0] cmp r0, #0 bne _02232A92 - bl sub_02022974 + bl GF_AssertFail _02232A92: ldr r0, _02232A9C ; =0x0225B6C0 ldr r1, [r0, #0] @@ -776,7 +776,7 @@ ov66_02232AA4: ; 0x02232AA4 ldr r0, [r0, #0] cmp r0, #0 bne _02232AB2 - bl sub_02022974 + bl GF_AssertFail _02232AB2: blx ov66_02235DD4 bl ov66_0223365C @@ -801,7 +801,7 @@ ov66_02232AD4: ; 0x02232AD4 ldr r0, [r0, #0] cmp r0, #0 bne _02232AE2 - bl sub_02022974 + bl GF_AssertFail _02232AE2: ldr r0, _02232AF8 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -827,7 +827,7 @@ ov66_02232B00: ; 0x02232B00 ldr r0, [r0, #0] cmp r0, #0 bne _02232B10 - bl sub_02022974 + bl GF_AssertFail _02232B10: ldr r0, _02232B1C ; =0x0225B6C0 add r1, r4, #0 @@ -846,7 +846,7 @@ ov66_02232B20: ; 0x02232B20 ldr r0, [r0, #0] cmp r0, #0 bne _02232B30 - bl sub_02022974 + bl GF_AssertFail _02232B30: ldr r1, _02232B48 ; =0x0225B6C0 mov r0, #0x47 @@ -871,7 +871,7 @@ ov66_02232B4C: ; 0x02232B4C ldr r0, [r0, #0] cmp r0, #0 bne _02232B5C - bl sub_02022974 + bl GF_AssertFail _02232B5C: ldr r1, _02232B74 ; =0x0225B6C0 mov r0, #0x49 @@ -948,7 +948,7 @@ ov66_02232BC8: ; 0x02232BC8 ldr r0, [r0, #0] cmp r0, #0 bne _02232BD8 - bl sub_02022974 + bl GF_AssertFail _02232BD8: ldr r0, _02232BE8 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -970,7 +970,7 @@ ov66_02232BEC: ; 0x02232BEC ldr r0, [r0, #0] cmp r0, #0 bne _02232BFC - bl sub_02022974 + bl GF_AssertFail _02232BFC: ldr r1, _02232C88 ; =0x0225B6C0 mov r0, #1 @@ -986,11 +986,11 @@ _02232BFC: _02232C12: cmp r0, #0 bne _02232C1A - bl sub_02022974 + bl GF_AssertFail _02232C1A: cmp r5, #8 blt _02232C22 - bl sub_02022974 + bl GF_AssertFail _02232C22: ldr r0, _02232C88 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -1061,7 +1061,7 @@ ov66_02232C8C: ; 0x02232C8C ldr r0, [r0, #0] cmp r0, #0 bne _02232C9A - bl sub_02022974 + bl GF_AssertFail _02232C9A: ldr r0, _02232CB4 ; =0x0225B6C0 ldr r0, [r0, #0] @@ -1106,11 +1106,11 @@ ov66_02232CD4: ; 0x02232CD4 ldr r0, [r0, #0] cmp r0, #0 bne _02232CE4 - bl sub_02022974 + bl GF_AssertFail _02232CE4: cmp r4, #0x14 blo _02232CEC - bl sub_02022974 + bl GF_AssertFail _02232CEC: ldr r0, _02232CFC ; =0x0225B6C0 ldr r1, [r0, #0] @@ -1132,11 +1132,11 @@ ov66_02232D00: ; 0x02232D00 ldr r0, [r0, #0] cmp r0, #0 bne _02232D10 - bl sub_02022974 + bl GF_AssertFail _02232D10: cmp r4, #0x14 blo _02232D18 - bl sub_02022974 + bl GF_AssertFail _02232D18: ldr r0, _02232D28 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -1160,7 +1160,7 @@ ov66_02232D30: ; 0x02232D30 add r6, r2, #0 cmp r0, #0 bne _02232D44 - bl sub_02022974 + bl GF_AssertFail _02232D44: ldr r2, _02232D5C ; =0x0225B6C0 mov r1, #0x61 @@ -1188,7 +1188,7 @@ ov66_02232D60: ; 0x02232D60 add r6, r2, #0 cmp r0, #0 bne _02232D74 - bl sub_02022974 + bl GF_AssertFail _02232D74: ldr r2, _02232D8C ; =0x0225B6C0 mov r1, #0x19 @@ -1213,7 +1213,7 @@ ov66_02232D90: ; 0x02232D90 ldr r0, [r0, #0] cmp r0, #0 bne _02232D9E - bl sub_02022974 + bl GF_AssertFail _02232D9E: ldr r0, _02232DC4 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -1245,7 +1245,7 @@ ov66_02232DC8: ; 0x02232DC8 ldr r0, [r0, #0] cmp r0, #0 bne _02232DD6 - bl sub_02022974 + bl GF_AssertFail _02232DD6: ldr r0, _02232DFC ; =0x0225B6C0 ldr r1, [r0, #0] @@ -1280,7 +1280,7 @@ ov66_02232E00: ; 0x02232E00 add r4, r2, #0 cmp r0, #0 bne _02232E14 - bl sub_02022974 + bl GF_AssertFail _02232E14: ldr r0, _02232E58 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -1289,7 +1289,7 @@ _02232E14: ldr r0, [r1, r0] cmp r0, r5 bhi _02232E26 - bl sub_02022974 + bl GF_AssertFail _02232E26: ldr r0, _02232E58 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -1301,7 +1301,7 @@ _02232E26: ldr r0, [r0, #4] cmp r4, r0 beq _02232E3E - bl sub_02022974 + bl GF_AssertFail _02232E3E: mov r0, #0 add r1, r5, #0 @@ -1311,7 +1311,7 @@ _02232E3E: bl ov66_0223365C cmp r0, #1 beq _02232E56 - bl sub_02022974 + bl GF_AssertFail _02232E56: pop {r4, r5, r6, pc} ; .align 2, 0 @@ -1329,7 +1329,7 @@ ov66_02232E5C: ; 0x02232E5C add r4, r3, #0 cmp r0, #0 bne _02232E72 - bl sub_02022974 + bl GF_AssertFail _02232E72: ldr r0, _02232EB8 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -1338,7 +1338,7 @@ _02232E72: ldr r0, [r1, r0] cmp r0, r5 bhi _02232E84 - bl sub_02022974 + bl GF_AssertFail _02232E84: ldr r0, _02232EB8 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -1350,7 +1350,7 @@ _02232E84: ldr r0, [r0, #4] cmp r4, r0 beq _02232E9C - bl sub_02022974 + bl GF_AssertFail _02232E9C: add r0, r6, #0 add r1, r5, #0 @@ -1360,7 +1360,7 @@ _02232E9C: bl ov66_0223365C cmp r0, #1 beq _02232EB4 - bl sub_02022974 + bl GF_AssertFail _02232EB4: pop {r3, r4, r5, r6, r7, pc} nop @@ -1377,7 +1377,7 @@ ov66_02232EBC: ; 0x02232EBC add r4, r2, #0 cmp r0, #0 bne _02232ED0 - bl sub_02022974 + bl GF_AssertFail _02232ED0: ldr r0, _02232F30 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -1386,7 +1386,7 @@ _02232ED0: ldr r0, [r1, r0] cmp r0, r5 bhi _02232EE2 - bl sub_02022974 + bl GF_AssertFail _02232EE2: ldr r0, _02232F30 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -1398,7 +1398,7 @@ _02232EE2: ldr r0, [r0, #4] cmp r4, r0 beq _02232EFA - bl sub_02022974 + bl GF_AssertFail _02232EFA: ldr r0, _02232F30 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -1406,7 +1406,7 @@ _02232EFA: ldrb r0, [r1, r0] cmp r0, #4 bne _02232F0A - bl sub_02022974 + bl GF_AssertFail _02232F0A: ldr r0, _02232F30 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -1420,7 +1420,7 @@ _02232F0A: bl ov66_0223365C cmp r0, #1 beq _02232F2C - bl sub_02022974 + bl GF_AssertFail _02232F2C: pop {r4, r5, r6, pc} nop @@ -1437,7 +1437,7 @@ ov66_02232F38: ; 0x02232F38 ldr r0, [r0, #0] cmp r0, #0 bne _02232F4A - bl sub_02022974 + bl GF_AssertFail _02232F4A: ldr r0, _02233048 ; =0x0225B6C0 add r1, r4, #0 @@ -1498,7 +1498,7 @@ _02232F6C: bl ov66_0223365C cmp r0, #0 bne _02232FC8 - bl sub_02022974 + bl GF_AssertFail _02232FC8: ldr r1, _02233048 ; =0x0225B6C0 mov r0, #0x4c @@ -1575,7 +1575,7 @@ ov66_02233064: ; 0x02233064 ldr r0, [r0, #0] cmp r0, #0 bne _02233072 - bl sub_02022974 + bl GF_AssertFail _02233072: ldr r0, _022330C0 ; =0x0225B6C0 ldr r2, [r0, #0] @@ -1591,7 +1591,7 @@ _02233072: bl ov66_0223365C cmp r0, #0 bne _02233096 - bl sub_02022974 + bl GF_AssertFail _02233096: ldr r0, _022330C0 ; =0x0225B6C0 ldr r4, [r0, #0] @@ -1603,7 +1603,7 @@ _02233096: bl ov66_022340F0 cmp r0, #0 bne _022330B2 - bl sub_02022974 + bl GF_AssertFail _022330B2: ldr r0, _022330C0 ; =0x0225B6C0 mov r2, #0 @@ -1625,7 +1625,7 @@ ov66_022330CC: ; 0x022330CC ldr r0, [r0, #0] cmp r0, #0 bne _022330DA - bl sub_02022974 + bl GF_AssertFail _022330DA: ldr r4, _02233120 ; =0x0225B6C0 ldr r3, _02233124 ; =0x0000069E @@ -1656,7 +1656,7 @@ _022330DA: bl ov66_0223365C cmp r0, #0 bne _0223311C - bl sub_02022974 + bl GF_AssertFail _0223311C: pop {r4, r5, r6, pc} nop @@ -1671,7 +1671,7 @@ ov66_02233128: ; 0x02233128 ldr r0, [r0, #0] cmp r0, #0 bne _02233136 - bl sub_02022974 + bl GF_AssertFail _02233136: ldr r0, _0223315C ; =0x0225B6C0 ldr r1, _02233160 ; =0x0000069C @@ -1706,7 +1706,7 @@ ov66_02233164: ; 0x02233164 ldr r0, [r0, #0] cmp r0, #0 bne _02233172 - bl sub_02022974 + bl GF_AssertFail _02233172: ldr r0, _0223317C ; =0x0225B6C0 ldr r1, [r0, #0] @@ -1726,7 +1726,7 @@ ov66_02233184: ; 0x02233184 ldr r0, [r0, #0] cmp r0, #0 bne _02233194 - bl sub_02022974 + bl GF_AssertFail _02233194: ldr r0, _022331A0 ; =0x0225B6C0 add r1, r4, #0 @@ -1745,7 +1745,7 @@ ov66_022331A4: ; 0x022331A4 ldr r0, [r0, #0] cmp r0, #0 bne _022331B4 - bl sub_02022974 + bl GF_AssertFail _022331B4: add r0, r4, #0 bl ov66_02233184 @@ -1781,11 +1781,11 @@ ov66_022331E4: ; 0x022331E4 ldr r0, [r0, #0] cmp r0, #0 bne _022331F4 - bl sub_02022974 + bl GF_AssertFail _022331F4: cmp r4, #3 blt _022331FC - bl sub_02022974 + bl GF_AssertFail _022331FC: ldr r0, _02233220 ; =0x0225B6C0 add r1, r4, #0 @@ -1816,11 +1816,11 @@ ov66_02233224: ; 0x02233224 ldr r0, [r0, #0] cmp r0, #0 bne _02233234 - bl sub_02022974 + bl GF_AssertFail _02233234: cmp r4, #3 blt _0223323C - bl sub_02022974 + bl GF_AssertFail _0223323C: ldr r0, _0223325C ; =0x0225B6C0 add r1, r4, #0 @@ -1849,7 +1849,7 @@ ov66_02233260: ; 0x02233260 ldr r0, [r0, #0] cmp r0, #0 bne _02233270 - bl sub_02022974 + bl GF_AssertFail _02233270: ldr r0, _022332E4 ; =0x0225B6C0 add r1, r5, #0 @@ -1923,11 +1923,11 @@ ov66_022332F8: ; 0x022332F8 ldr r0, [r0, #0] cmp r0, #0 bne _02233308 - bl sub_02022974 + bl GF_AssertFail _02233308: cmp r4, #3 blt _02233310 - bl sub_02022974 + bl GF_AssertFail _02233310: ldr r0, _02233334 ; =0x0225B6C0 add r1, r4, #0 @@ -1959,7 +1959,7 @@ ov66_02233340: ; 0x02233340 ldr r0, [r0, #0] cmp r0, #0 bne _0223334E - bl sub_02022974 + bl GF_AssertFail _0223334E: ldr r0, _0223336C ; =0x0225B6C0 ldr r1, _02233370 ; =0x0000069C @@ -1989,7 +1989,7 @@ ov66_02233374: ; 0x02233374 ldr r0, [r0, #0] cmp r0, #0 bne _02233382 - bl sub_02022974 + bl GF_AssertFail _02233382: ldr r0, _0223338C ; =0x0225B6C0 ldr r1, [r0, #0] @@ -2009,7 +2009,7 @@ ov66_02233394: ; 0x02233394 ldr r0, [r0, #0] cmp r0, #0 bne _022333A4 - bl sub_02022974 + bl GF_AssertFail _022333A4: ldr r0, _022333B8 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -2031,7 +2031,7 @@ ov66_022333BC: ; 0x022333BC ldr r0, [r0, #0] cmp r0, #0 bne _022333CC - bl sub_02022974 + bl GF_AssertFail _022333CC: ldr r0, _022333E0 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -2053,11 +2053,11 @@ ov66_022333E4: ; 0x022333E4 ldr r0, [r0, #0] cmp r0, #0 bne _022333F4 - bl sub_02022974 + bl GF_AssertFail _022333F4: cmp r4, #3 blt _022333FC - bl sub_02022974 + bl GF_AssertFail _022333FC: ldr r0, _02233430 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -2066,14 +2066,14 @@ _022333FC: ldr r0, [r1, r0] cmp r0, #1 bne _0223340E - bl sub_02022974 + bl GF_AssertFail _0223340E: add r0, r4, #0 blx ov66_02236D74 bl ov66_0223365C cmp r0, #1 beq _02233420 - bl sub_02022974 + bl GF_AssertFail _02233420: ldr r0, _02233430 ; =0x0225B6C0 mov r2, #1 @@ -2093,7 +2093,7 @@ ov66_02233434: ; 0x02233434 ldr r0, [r0, #0] cmp r0, #0 bne _02233442 - bl sub_02022974 + bl GF_AssertFail _02233442: ldr r0, _02233450 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -2113,11 +2113,11 @@ ov66_02233454: ; 0x02233454 ldr r0, [r0, #0] cmp r0, #0 bne _02233464 - bl sub_02022974 + bl GF_AssertFail _02233464: cmp r4, #0xb blt _0223346C - bl sub_02022974 + bl GF_AssertFail _0223346C: cmp r4, #0xa bhi _0223350E @@ -2213,7 +2213,7 @@ _022334FE: ldr r0, [r1, r0] pop {r4, pc} _0223350E: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} nop @@ -2235,11 +2235,11 @@ ov66_02233538: ; 0x02233538 ldr r0, [r0, #0] cmp r0, #0 bne _02233548 - bl sub_02022974 + bl GF_AssertFail _02233548: cmp r4, #8 blt _02233550 - bl sub_02022974 + bl GF_AssertFail _02233550: cmp r4, #7 bhi _022335AC @@ -2293,7 +2293,7 @@ _0223359A: add r0, r2, r0 pop {r4, pc} _022335AC: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} ; .align 2, 0 @@ -2311,15 +2311,15 @@ ov66_022335C0: ; 0x022335C0 ldr r0, [r0, #0] cmp r0, #0 bne _022335D2 - bl sub_02022974 + bl GF_AssertFail _022335D2: cmp r5, #2 blt _022335DA - bl sub_02022974 + bl GF_AssertFail _022335DA: cmp r4, #0xc blo _022335E2 - bl sub_02022974 + bl GF_AssertFail _022335E2: cmp r5, #2 blt _022335EA @@ -2359,7 +2359,7 @@ ov66_0223361C: ; 0x0223361C ldr r0, [r0, #0] cmp r0, #0 bne _0223362A - bl sub_02022974 + bl GF_AssertFail _0223362A: mov r0, #0 add r1, r0, #0 @@ -2410,14 +2410,14 @@ _02233680: mov r1, #0 b _02233696 _02233684: - bl sub_02022974 + bl GF_AssertFail mov r1, #0 b _02233696 _0223368C: mov r1, #0 b _02233696 _02233690: - bl sub_02022974 + bl GF_AssertFail mov r1, #0 _02233696: add r0, r1, #0 @@ -2499,7 +2499,7 @@ _02233706: _0223370E: cmp r1, #0x14 blt _0223371C - bl sub_02022974 + bl GF_AssertFail add sp, #8 mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -2592,7 +2592,7 @@ ov66_022337A8: ; 0x022337A8 mvn r0, r0 cmp r7, r0 bne _022337C4 - bl sub_02022974 + bl GF_AssertFail _022337C4: ldr r2, [r4, #0x28] ldr r5, [r4, #0x24] @@ -2625,7 +2625,7 @@ ov66_022337E8: ; 0x022337E8 mvn r0, r0 cmp r4, r0 bne _02233800 - bl sub_02022974 + bl GF_AssertFail _02233800: ldr r0, [r5, #0x28] ldr r2, [r5, #0x24] @@ -2646,7 +2646,7 @@ ov66_0223380C: ; 0x0223380C mvn r0, r0 cmp r4, r0 bne _02233824 - bl sub_02022974 + bl GF_AssertFail _02233824: ldr r2, [r5, #0x28] ldr r1, [r5, #0x24] @@ -2671,7 +2671,7 @@ ov66_02233838: ; 0x02233838 mvn r0, r0 cmp r6, r0 bne _02233852 - bl sub_02022974 + bl GF_AssertFail _02233852: mov r0, #0xc mul r0, r6 @@ -2695,7 +2695,7 @@ ov66_02233864: ; 0x02233864 mvn r0, r0 cmp r4, r0 bne _0223387C - bl sub_02022974 + bl GF_AssertFail _0223387C: mov r0, #0xc add r5, #0x2c @@ -2716,7 +2716,7 @@ ov66_02233888: ; 0x02233888 mvn r0, r0 cmp r4, r0 bne _022338A0 - bl sub_02022974 + bl GF_AssertFail _022338A0: mov r0, #0xc add r1, r4, #0 @@ -2756,7 +2756,7 @@ _022338D8: ldr r0, [r5, r0] cmp r0, #0 beq _022338E6 - bl sub_02022974 + bl GF_AssertFail _022338E6: cmp r4, #0 bne _022338EE @@ -2801,7 +2801,7 @@ _0223392C: ldr r0, [r5, r7] cmp r0, #0 bne _02233936 - bl sub_02022974 + bl GF_AssertFail _02233936: mov r0, #0x12 lsl r0, r0, #4 @@ -2872,7 +2872,7 @@ ov66_02233984: ; 0x02233984 ldrh r0, [r5, r4] cmp r1, r0 blt _022339B4 - bl sub_02022974 + bl GF_AssertFail _022339B4: ldr r1, [sp, #4] mov r0, #0 @@ -2994,7 +2994,7 @@ ov66_02233A6C: ; 0x02233A6C ldrh r0, [r1, r0] cmp r4, r0 blt _02233A82 - bl sub_02022974 + bl GF_AssertFail _02233A82: mov r0, #0x12 add r1, r5, r6 @@ -3060,7 +3060,7 @@ ov66_02233AE8: ; 0x02233AE8 str r1, [sp] cmp r1, #4 blt _02233AF8 - bl sub_02022974 + bl GF_AssertFail _02233AF8: ldr r0, [sp] bl ov66_022336C0 @@ -3132,7 +3132,7 @@ ov66_02233B54: ; 0x02233B54 bl ov66_0223365C cmp r0, #0 bne _02233B82 - bl sub_02022974 + bl GF_AssertFail _02233B82: ldr r2, _02233BE8 ; =0x02258DF0 mov r0, #0 @@ -3173,7 +3173,7 @@ _02233BCC: strb r2, [r4, r0] pop {r3, r4, r5, pc} _02233BD4: - bl sub_02022974 + bl GF_AssertFail bl ov66_02232AA4 pop {r3, r4, r5, pc} nop @@ -3379,7 +3379,7 @@ _02233D42: ldr r0, [sp, #0x18] cmp r1, r0 bls _02233D6C - bl sub_02022974 + bl GF_AssertFail _02233D6C: ldr r0, _02233D8C ; =0x0225B6C0 mov r3, #0x61 @@ -3750,7 +3750,7 @@ ov66_02234018: ; 0x02234018 ldr r0, [r1, r0] cmp r0, #1 beq _0223402C - bl sub_02022974 + bl GF_AssertFail _0223402C: ldr r0, _0223403C ; =0x0225B6C0 mov r2, #2 @@ -3803,7 +3803,7 @@ ov66_02234074: ; 0x02234074 str r2, [sp] cmp r6, #3 blt _02234086 - bl sub_02022974 + bl GF_AssertFail _02234086: add r0, r5, #0 add r1, r6, #0 @@ -3867,7 +3867,7 @@ ov66_022340F0: ; 0x022340F0 add r6, r2, #0 cmp r4, #3 blt _02234100 - bl sub_02022974 + bl GF_AssertFail _02234100: add r0, r5, #0 add r1, r4, #0 @@ -3900,7 +3900,7 @@ ov66_0223412C: ; 0x0223412C add r5, r0, #0 cmp r4, #3 blt _0223413A - bl sub_02022974 + bl GF_AssertFail _0223413A: mov r0, #0x4c mul r0, r4 @@ -3980,7 +3980,7 @@ ov66_022341C0: ; 0x022341C0 add r5, r0, #0 cmp r6, #3 blt _022341CE - bl sub_02022974 + bl GF_AssertFail _022341CE: mov r0, #0x4c add r4, r6, #0 @@ -3990,7 +3990,7 @@ _022341CE: ldrh r0, [r1, r0] cmp r0, #1 beq _022341E2 - bl sub_02022974 + bl GF_AssertFail _022341E2: ldr r0, _022341F0 ; =0x000005B8 add r0, r5, r0 @@ -4014,7 +4014,7 @@ ov66_022341F4: ; 0x022341F4 add r4, r0, #0 cmp r4, #4 bls _02234210 - bl sub_02022974 + bl GF_AssertFail _02234210: ldr r0, _02234274 ; =0x0225B6C0 ldr r1, [r0, #0] @@ -4188,7 +4188,7 @@ ov66_0223431C: ; 0x0223431C add r6, r1, #0 cmp r4, r0 blo _0223432E - bl sub_02022974 + bl GF_AssertFail _0223432E: ldrh r0, [r5, #4] cmp r4, r0 diff --git a/asm/ov66_022343A8.s b/asm/ov66_022343A8.s index 8bffa19ed3..4dfc5ed545 100644 --- a/asm/ov66_022343A8.s +++ b/asm/ov66_022343A8.s @@ -686,7 +686,7 @@ _022348C4: add r3, r3, #4 cmp r2, #0x14 blt _022348B6 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -830,7 +830,7 @@ _022349A4: cmp r6, r0 blo _0223498E _022349AE: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} ; .align 2, 0 diff --git a/asm/ov66_02234EA8.s b/asm/ov66_02234EA8.s index b9391b6a2b..7d0be15beb 100644 --- a/asm/ov66_02234EA8.s +++ b/asm/ov66_02234EA8.s @@ -93,7 +93,7 @@ ov66_02234F2C: ; 0x02234F2C bl _u32_div_f cmp r5, r0 blt _02234F5E - bl sub_02022974 + bl GF_AssertFail _02234F5E: mov r0, #6 add r1, r5, #0 @@ -134,7 +134,7 @@ _02234F74: ldrsh r0, [r1, r0] b _02234FB8 _02234FB0: - bl sub_02022974 + bl GF_AssertFail mov r0, #2 ldrsh r0, [r5, r0] _02234FB8: diff --git a/asm/ov67_0225C700.s b/asm/ov67_0225C700.s index cd421128ae..dfc7318b7b 100644 --- a/asm/ov67_0225C700.s +++ b/asm/ov67_0225C700.s @@ -492,7 +492,7 @@ _0225CAF8: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _0225CB06: - bl sub_02022974 + bl GF_AssertFail _0225CB0A: mov r0, #0 add sp, #0x10 @@ -1089,7 +1089,7 @@ _0225CFF0: ldr r0, [sp, #0x24] cmp r0, #0x15 blt _0225CFFA - bl sub_02022974 + bl GF_AssertFail _0225CFFA: ldr r0, [sp, #0x30] mov r7, #1 @@ -1475,7 +1475,7 @@ ov67_0225D2EC: ; 0x0225D2EC ldr r0, [r4, #0x24] cmp r0, #0 beq _0225D300 - bl sub_02022974 + bl GF_AssertFail _0225D300: add r0, r4, #0 add r0, #8 @@ -1497,7 +1497,7 @@ ov67_0225D310: ; 0x0225D310 ldr r0, [r4, #0x24] cmp r0, #0 bne _0225D324 - bl sub_02022974 + bl GF_AssertFail _0225D324: ldr r0, [r4, #0x24] bl sub_0200EBA0 diff --git a/asm/ov68_0225C700.s b/asm/ov68_0225C700.s index a011c50f7b..9822cc2db8 100644 --- a/asm/ov68_0225C700.s +++ b/asm/ov68_0225C700.s @@ -48,7 +48,7 @@ ov68_0225C700: ; 0x0225C700 ldr r0, [r5, #8] cmp r0, #2 blt _0225C762 - bl sub_02022974 + bl GF_AssertFail _0225C762: mov r1, #0x7a str r1, [sp] @@ -619,7 +619,7 @@ ov68_0225CBEC: ; 0x0225CBEC add r6, r2, #0 cmp r4, #9 blo _0225CBFC - bl sub_02022974 + bl GF_AssertFail _0225CBFC: lsl r0, r4, #2 ldr r0, [r5, r0] @@ -643,7 +643,7 @@ ov68_0225CC18: ; 0x0225CC18 cmp r2, #0x3c blo _0225CC2A bhs _0225CC28 - bl sub_02022974 + bl GF_AssertFail _0225CC28: mov r2, #0 _0225CC2A: @@ -670,7 +670,7 @@ ov68_0225CC44: ; 0x0225CC44 cmp r3, #0x3c blo _0225CC58 bhs _0225CC56 - bl sub_02022974 + bl GF_AssertFail _0225CC56: mov r3, #0 _0225CC58: @@ -816,13 +816,13 @@ ov68_0225CCD0: ; 0x0225CCD0 bl sub_0200A3DC cmp r0, #0 bne _0225CD6C - bl sub_02022974 + bl GF_AssertFail _0225CD6C: ldr r0, [r5, #0x1c] bl sub_0200A640 cmp r0, #0 bne _0225CD7A - bl sub_02022974 + bl GF_AssertFail _0225CD7A: ldr r0, [r5, #0x18] bl sub_02009D4C @@ -1145,7 +1145,7 @@ _0225D004: strh r0, [r4, #0x28] b _0225D018 _0225D014: - bl sub_02022974 + bl GF_AssertFail _0225D018: mov r0, #0 pop {r4, r5, r6, pc} @@ -1457,7 +1457,7 @@ ov68_0225D284: ; 0x0225D284 ldr r0, [r4, #0x1c] cmp r0, #0 beq _0225D292 - bl sub_02022974 + bl GF_AssertFail _0225D292: add r0, r4, #0 add r0, #8 @@ -1535,7 +1535,7 @@ ov68_0225D304: ; 0x0225D304 add r6, r2, #0 cmp r0, #0 beq _0225D318 - bl sub_02022974 + bl GF_AssertFail _0225D318: str r6, [sp] ldr r0, [r4, #0] @@ -2214,7 +2214,7 @@ _0225D850: .word 0x000D0E00 _0225D854: .word 0x000B0C00 _0225D858: .word 0x000F0E00 _0225D85C: - bl sub_02022974 + bl GF_AssertFail _0225D860: mov r0, #0 add sp, #0x28 @@ -2676,7 +2676,7 @@ _0225DBC4: bl ov66_02233538 add r4, r0, #0 bne _0225DBF6 - bl sub_02022974 + bl GF_AssertFail _0225DBF6: ldr r0, [r5, #0x10] add r1, r4, #0 @@ -2688,7 +2688,7 @@ _0225DC02: bl ov66_02233538 add r6, r0, #0 bne _0225DC10 - bl sub_02022974 + bl GF_AssertFail _0225DC10: ldr r0, [r5, #0x14] add r1, r6, #0 @@ -2789,7 +2789,7 @@ ov68_0225DCA4: ; 0x0225DCA4 add r6, r2, #0 cmp r4, #3 blo _0225DCB4 - bl sub_02022974 + bl GF_AssertFail _0225DCB4: lsl r2, r4, #2 mov r1, #0 diff --git a/asm/ov69_0225C700.s b/asm/ov69_0225C700.s index 0403aab331..45cc3a78f8 100644 --- a/asm/ov69_0225C700.s +++ b/asm/ov69_0225C700.s @@ -1040,7 +1040,7 @@ _0225CF18: mov r0, #1 pop {r4, pc} _0225CF1C: - bl sub_02022974 + bl GF_AssertFail _0225CF20: mov r0, #0 pop {r4, pc} @@ -1214,7 +1214,7 @@ ov69_0225D030: ; 0x0225D030 bl ov69_0225D268 cmp r0, #1 beq _0225D084 - bl sub_02022974 + bl GF_AssertFail _0225D084: pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -1419,7 +1419,7 @@ ov69_0225D1E0: ; 0x0225D1E0 bl ov69_0225DA70 cmp r6, r0 blo _0225D212 - bl sub_02022974 + bl GF_AssertFail _0225D212: mov r0, #0x89 lsl r0, r0, #2 @@ -2453,7 +2453,7 @@ ov69_0225D9F0: ; 0x0225D9F0 add r4, r1, #0 cmp r6, r0 blo _0225DA02 - bl sub_02022974 + bl GF_AssertFail _0225DA02: mov r0, #0x30 mul r0, r6 @@ -2478,7 +2478,7 @@ ov69_0225DA1C: ; 0x0225DA1C add r4, r1, #0 cmp r4, r0 blo _0225DA2C - bl sub_02022974 + bl GF_AssertFail _0225DA2C: mov r0, #0x30 mul r0, r4 @@ -2496,7 +2496,7 @@ ov69_0225DA38: ; 0x0225DA38 add r4, r1, #0 cmp r4, r0 blo _0225DA48 - bl sub_02022974 + bl GF_AssertFail _0225DA48: mov r0, #0x30 mul r0, r4 @@ -2514,7 +2514,7 @@ ov69_0225DA54: ; 0x0225DA54 add r4, r1, #0 cmp r4, r0 blo _0225DA64 - bl sub_02022974 + bl GF_AssertFail _0225DA64: mov r0, #0x30 mul r0, r4 @@ -4166,7 +4166,7 @@ ov69_0225E644: ; 0x0225E644 add r7, r3, #0 cmp r4, #3 blo _0225E658 - bl sub_02022974 + bl GF_AssertFail _0225E658: mov r0, #0x5a lsl r0, r0, #2 @@ -4241,7 +4241,7 @@ ov69_0225E6E8: ; 0x0225E6E8 add r6, r2, #0 cmp r4, #3 blo _0225E6F8 - bl sub_02022974 + bl GF_AssertFail _0225E6F8: lsl r0, r4, #4 add r1, r5, r0 @@ -4505,7 +4505,7 @@ _0225E8A8: bl sub_0201DC68 cmp r0, #0 bne _0225E8E8 - bl sub_02022974 + bl GF_AssertFail _0225E8E8: add sp, #0x24 pop {r4, r5, r6, r7, pc} @@ -4519,7 +4519,7 @@ ov69_0225E8EC: ; 0x0225E8EC add r6, r2, #0 cmp r4, #3 blo _0225E8FC - bl sub_02022974 + bl GF_AssertFail _0225E8FC: add r0, r5, r4 strb r6, [r0, #4] @@ -4631,7 +4631,7 @@ ov69_0225E960: ; 0x0225E960 bl sub_0200A640 cmp r0, #0 bne _0225E9CC - bl sub_02022974 + bl GF_AssertFail _0225E9CC: ldr r0, [sp, #0x2c] ldr r0, [r0, #0x70] @@ -4695,7 +4695,7 @@ _0225E9E6: bl sub_0200A3DC cmp r0, #0 bne _0225EA54 - bl sub_02022974 + bl GF_AssertFail _0225EA54: ldr r0, [r4, #0x6c] bl sub_02009D4C @@ -5330,7 +5330,7 @@ ov69_0225EEEC: ; 0x0225EEEC add r4, r0, #0 cmp r4, #0x18 blo _0225EEF8 - bl sub_02022974 + bl GF_AssertFail _0225EEF8: ldr r0, _0225EF00 ; =0x0225F0E8 lsl r1, r4, #1 @@ -5346,7 +5346,7 @@ ov69_0225EF04: ; 0x0225EF04 add r4, r0, #0 cmp r4, #0x18 blo _0225EF10 - bl sub_02022974 + bl GF_AssertFail _0225EF10: ldr r0, _0225EF18 ; =0x0225F0E9 lsl r1, r4, #1 diff --git a/asm/ov6_0223E140.s b/asm/ov6_0223E140.s index 8d88546bb3..3b0a14f59c 100644 --- a/asm/ov6_0223E140.s +++ b/asm/ov6_0223E140.s @@ -63,7 +63,7 @@ ov6_0223E198: ; 0x0223E198 ldr r0, [r4, #0x38] cmp r0, #2 beq _0223E1A6 - bl sub_02022974 + bl GF_AssertFail _0223E1A6: mov r0, #3 str r0, [r4, #0x38] @@ -913,7 +913,7 @@ ov6_0223E7B4: ; 0x0223E7B4 bl sub_0206251C add r5, r0, #0 bne _0223E7C8 - bl sub_02022974 + bl GF_AssertFail _0223E7C8: add r0, r5, #0 bl sub_02063020 @@ -4144,7 +4144,7 @@ ov6_022400A8: ; 0x022400A8 ldr r0, [r4, r0] cmp r0, #5 beq _022400BA - bl sub_02022974 + bl GF_AssertFail _022400BA: add r0, r4, #0 bl sub_020181C4 @@ -4358,7 +4358,7 @@ ov6_02240240: ; 0x02240240 str r0, [r4, #0] cmp r0, #0 bne _02240256 - bl sub_02022974 + bl GF_AssertFail _02240256: mov r0, #0 str r0, [r4, #0x24] @@ -4976,7 +4976,7 @@ ov6_0224067C: ; 0x0224067C add r7, r3, #0 cmp r0, #0 beq _02240694 - bl sub_02022974 + bl GF_AssertFail _02240694: mov r0, #0x71 mov r1, #0 @@ -5033,7 +5033,7 @@ ov6_022406D8: ; 0x022406D8 bl ov6_022408A8 add r4, r0, #0 bne _02240700 - bl sub_02022974 + bl GF_AssertFail _02240700: mov r1, #0x73 lsl r1, r1, #2 @@ -5190,7 +5190,7 @@ ov6_022407E8: ; 0x022407E8 add r7, r3, #0 cmp r0, #0 beq _022407FC - bl sub_02022974 + bl GF_AssertFail _022407FC: add r0, r5, #0 add r0, #0x7c diff --git a/asm/ov6_02240C9C.s b/asm/ov6_02240C9C.s index 154ad96d2e..c69deddd69 100644 --- a/asm/ov6_02240C9C.s +++ b/asm/ov6_02240C9C.s @@ -430,7 +430,7 @@ _02240FE8: bl ov6_02241790 b _02241024 _02241014: - bl sub_02022974 + bl GF_AssertFail ldr r0, [sp, #0x2c] bl sub_020520A4 add sp, #0xb4 @@ -451,13 +451,13 @@ _02241036: bl sub_0201833C cmp r0, #0 bne _02241044 - bl sub_02022974 + bl GF_AssertFail _02241044: mov r0, #0xb bl sub_0201833C cmp r0, #0 bne _02241052 - bl sub_02022974 + bl GF_AssertFail _02241052: ldr r0, [sp, #0x10] cmp r0, #0 @@ -520,7 +520,7 @@ _02241086: lsr r5, r0, #0x10 cmp r5, #0x64 blo _022410D8 - bl sub_02022974 + bl GF_AssertFail _022410D8: cmp r5, r6 blt _022410E2 @@ -869,7 +869,7 @@ _0224138C: bl ov6_02241790 b _022413C2 _022413B8: - bl sub_02022974 + bl GF_AssertFail add sp, #0xac mov r0, #0 pop {r4, r5, r6, r7, pc} @@ -882,7 +882,7 @@ _022413C2: bl sub_02050E78 b _022413D6 _022413D2: - bl sub_02022974 + bl GF_AssertFail _022413D6: mov r0, #0 add r5, #0x78 @@ -1151,7 +1151,7 @@ _022415FA: bl ov6_0224174C b _02241634 _02241624: - bl sub_02022974 + bl GF_AssertFail ldr r0, [r4, #0] bl sub_020520A4 add sp, #0xac @@ -1167,13 +1167,13 @@ _0224163C: bl sub_0201833C cmp r0, #0 bne _0224164A - bl sub_02022974 + bl GF_AssertFail _0224164A: mov r0, #0xb bl sub_0201833C cmp r0, #0 bne _02241658 - bl sub_02022974 + bl GF_AssertFail _02241658: ldr r0, [sp, #0x10] cmp r0, #0 @@ -1394,7 +1394,7 @@ ov6_022417C8: ; 0x022417C8 lsr r4, r0, #0x10 cmp r4, #0x64 blo _02241800 - bl sub_02022974 + bl GF_AssertFail _02241800: cmp r4, #5 blo _02241808 @@ -1438,7 +1438,7 @@ _02241844: lsr r6, r0, #0x10 cmp r6, #0x64 blo _0224185C - bl sub_02022974 + bl GF_AssertFail _0224185C: cmp r6, r4 bge _02241870 @@ -1525,7 +1525,7 @@ ov6_022418DC: ; 0x022418DC lsr r5, r0, #0x10 cmp r5, #0x64 blo _022418F8 - bl sub_02022974 + bl GF_AssertFail _022418F8: cmp r5, r4 blo _02241900 @@ -1547,7 +1547,7 @@ ov6_02241904: ; 0x02241904 lsr r4, r0, #0x10 cmp r4, #0x64 blo _0224191E - bl sub_02022974 + bl GF_AssertFail _0224191E: lsl r0, r4, #0x18 lsr r0, r0, #0x18 @@ -1638,7 +1638,7 @@ ov6_022419A0: ; 0x022419A0 lsr r4, r0, #0x10 cmp r4, #0x64 blo _022419BA - bl sub_02022974 + bl GF_AssertFail _022419BA: lsl r0, r4, #0x18 lsr r0, r0, #0x18 @@ -1684,7 +1684,7 @@ ov6_022419EC: ; 0x022419EC lsr r6, r0, #0x10 cmp r6, #0x64 blo _02241A0A - bl sub_02022974 + bl GF_AssertFail _02241A0A: lsl r0, r6, #0x18 lsr r0, r0, #0x18 @@ -1765,7 +1765,7 @@ _02241A84: mov r4, #4 b _02241A8C _02241A88: - bl sub_02022974 + bl GF_AssertFail _02241A8C: add r0, r4, #0 pop {r4, r5, r6, pc} @@ -1836,7 +1836,7 @@ ov6_02241AE4: ; 0x02241AE4 lsr r5, r0, #0x10 cmp r5, #2 blo _02241B04 - bl sub_02022974 + bl GF_AssertFail _02241B04: cmp r5, #0 bne _02241B1E @@ -1857,7 +1857,7 @@ _02241B1E: lsr r4, r0, #0x10 cmp r4, #0x19 blo _02241B34 - bl sub_02022974 + bl GF_AssertFail _02241B34: lsl r0, r4, #0x18 lsr r0, r0, #0x18 @@ -1908,7 +1908,7 @@ _02241B84: lsr r7, r0, #0x10 cmp r7, #2 blo _02241B94 - bl sub_02022974 + bl GF_AssertFail _02241B94: cmp r7, #0 bne _02241BA0 @@ -1962,7 +1962,7 @@ ov6_02241BAC: ; 0x02241BAC lsr r4, r0, #0x10 cmp r4, #3 blo _02241BFE - bl sub_02022974 + bl GF_AssertFail _02241BFE: cmp r4, #0 beq _02241C38 @@ -1983,7 +1983,7 @@ _02241C16: lsr r4, r0, #0x10 cmp r4, #2 blo _02241C2A - bl sub_02022974 + bl GF_AssertFail _02241C2A: cmp r4, #0 bne _02241C38 @@ -2007,7 +2007,7 @@ _02241C44: add r7, r0, #0 cmp r7, #2 bne _02241C5C - bl sub_02022974 + bl GF_AssertFail _02241C5C: ldr r0, [sp, #0x24] cmp r7, r0 @@ -2047,7 +2047,7 @@ _02241C86: bl ov6_02242514 cmp r0, #0 bne _02241CB2 - bl sub_02022974 + bl GF_AssertFail _02241CB2: ldr r0, [sp, #0x1c] bl sub_020181C4 @@ -2097,7 +2097,7 @@ _02241CF0: lsr r6, r0, #0x10 cmp r6, #3 blo _02241D16 - bl sub_02022974 + bl GF_AssertFail _02241D16: cmp r6, #0 beq _02241D80 @@ -2117,7 +2117,7 @@ _02241D30: mov r6, #1 b _02241D3C _02241D38: - bl sub_02022974 + bl GF_AssertFail _02241D3C: ldr r0, [sp, #0x28] add r1, r5, #0 @@ -2142,7 +2142,7 @@ _02241D3C: bl ov6_02242514 cmp r0, #0 bne _02241D76 - bl sub_02022974 + bl GF_AssertFail _02241D76: add r0, r4, #0 bl sub_020181C4 @@ -2169,7 +2169,7 @@ _02241D80: bl ov6_02242514 cmp r0, #0 bne _02241DB4 - bl sub_02022974 + bl GF_AssertFail _02241DB4: add r0, r4, #0 bl sub_020181C4 @@ -2317,7 +2317,7 @@ _02241ECC: add r7, r0, #0 b _02241EE2 _02241EDE: - bl sub_02022974 + bl GF_AssertFail _02241EE2: add r0, r5, #0 add r1, r6, #0 @@ -2367,7 +2367,7 @@ ov6_02241F2C: ; 0x02241F2C add r7, r3, #0 cmp r5, #0 bne _02241F40 - bl sub_02022974 + bl GF_AssertFail _02241F40: lsl r0, r4, #0x18 lsr r1, r0, #0x18 @@ -2518,7 +2518,7 @@ ov6_02242034: ; 0x02242034 lsr r6, r0, #0x10 cmp r6, #0xb blo _02242072 - bl sub_02022974 + bl GF_AssertFail _02242072: add r0, r6, #5 lsl r0, r0, #0x18 @@ -2540,7 +2540,7 @@ _0224208E: lsr r6, r0, #0x10 cmp r6, #2 blo _0224209E - bl sub_02022974 + bl GF_AssertFail _0224209E: cmp r6, #0 beq _022420A4 @@ -2679,7 +2679,7 @@ _0224218A: ldr r0, [r0, r1] pop {r4, pc} _02242192: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} ; .align 2, 0 @@ -2782,7 +2782,7 @@ ov6_0224222C: ; 0x0224222C lsr r4, r0, #0x10 cmp r4, #2 blo _02242252 - bl sub_02022974 + bl GF_AssertFail _02242252: cmp r4, #0 bne _02242266 @@ -2899,7 +2899,7 @@ _02242304: lsr r4, r0, #0x10 cmp r4, #2 blo _0224231A - bl sub_02022974 + bl GF_AssertFail _0224231A: cmp r4, #0 bne _02242322 @@ -3039,7 +3039,7 @@ ov6_0224239C: ; 0x0224239C bl sub_0207A048 cmp r0, #0 bne _02242430 - bl sub_02022974 + bl GF_AssertFail _02242430: add r0, r4, #0 bl sub_020181C4 @@ -3103,7 +3103,7 @@ _022424A0: lsr r4, r0, #0x10 cmp r4, #2 blo _022424B0 - bl sub_02022974 + bl GF_AssertFail _022424B0: cmp r4, #0 bne _022424BA @@ -3115,7 +3115,7 @@ _022424BA: bls _02242502 cmp r5, #0 bne _022424C6 - bl sub_02022974 + bl GF_AssertFail _022424C6: cmp r5, #1 bhi _022424CE @@ -3137,7 +3137,7 @@ _022424CE: lsr r4, r0, #0x10 cmp r4, r5 blo _022424F6 - bl sub_02022974 + bl GF_AssertFail _022424F6: lsl r1, r4, #2 add r0, sp, #8 @@ -3278,7 +3278,7 @@ _022425EE: lsr r6, r0, #0x10 cmp r6, #2 blo _022425FE - bl sub_02022974 + bl GF_AssertFail _022425FE: cmp r6, #0 bne _02242606 @@ -3359,7 +3359,7 @@ _02242660: beq _0224269A cmp r1, #8 ble _02242690 - bl sub_02022974 + bl GF_AssertFail _02242690: add r5, #0xa0 ldr r0, [r5, #0] diff --git a/asm/ov6_02242984.s b/asm/ov6_02242984.s index f2078b8a41..e4f6525733 100644 --- a/asm/ov6_02242984.s +++ b/asm/ov6_02242984.s @@ -58,7 +58,7 @@ _02242994: lsr r4, r0, #0x10 cmp r4, #0xc blo _02242A00 - bl sub_02022974 + bl GF_AssertFail _02242A00: lsl r1, r4, #2 add r0, sp, #4 @@ -92,7 +92,7 @@ _02242A2E: lsr r6, r0, #0x10 cmp r6, #0x24 blo _02242A44 - bl sub_02022974 + bl GF_AssertFail _02242A44: lsl r0, r6, #0x18 lsr r2, r0, #0x16 diff --git a/asm/ov6_02242AF0.s b/asm/ov6_02242AF0.s index 2e9fc2ba46..4af1a2d7b6 100644 --- a/asm/ov6_02242AF0.s +++ b/asm/ov6_02242AF0.s @@ -158,7 +158,7 @@ _02242BFE: str r0, [r5, #0x10] b _02242C12 _02242C0E: - bl sub_02022974 + bl GF_AssertFail _02242C12: ldr r0, [sp] str r0, [r5, #8] diff --git a/asm/ov6_02242F74.s b/asm/ov6_02242F74.s index 0483d49ce6..8c11341446 100644 --- a/asm/ov6_02242F74.s +++ b/asm/ov6_02242F74.s @@ -87,7 +87,7 @@ _02242FF8: mov r4, #5 b _02243000 _02242FFC: - bl sub_02022974 + bl GF_AssertFail _02243000: add r0, r4, #0 pop {r4, pc} diff --git a/asm/ov6_02243004.s b/asm/ov6_02243004.s index 6af25784d4..8402e71d92 100644 --- a/asm/ov6_02243004.s +++ b/asm/ov6_02243004.s @@ -100,7 +100,7 @@ _022430AC: str r0, [r1, #0] b _022430BC _022430B8: - bl sub_02022974 + bl GF_AssertFail _022430BC: mov r0, #0 pop {r3, pc} diff --git a/asm/ov6_022430C4.s b/asm/ov6_022430C4.s index 3e8db00501..f715bde24c 100644 --- a/asm/ov6_022430C4.s +++ b/asm/ov6_022430C4.s @@ -36,7 +36,7 @@ ov6_022430E8: ; 0x022430E8 add r5, r0, #0 cmp r4, #3 blo _022430F8 - bl sub_02022974 + bl GF_AssertFail _022430F8: ldr r0, [r5, #0xc] bl sub_0202D834 @@ -59,7 +59,7 @@ ov6_02243114: ; 0x02243114 add r5, r0, #0 cmp r4, #3 blo _02243124 - bl sub_02022974 + bl GF_AssertFail _02243124: ldr r0, [r5, #0xc] bl sub_0202D834 diff --git a/asm/ov6_02243258.s b/asm/ov6_02243258.s index 3b0cc1d58e..502c8b09a7 100644 --- a/asm/ov6_02243258.s +++ b/asm/ov6_02243258.s @@ -365,7 +365,7 @@ _0224350E: cmp r2, r5 blt _022434D2 _02243516: - bl sub_02022974 + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} ; .align 2, 0 @@ -398,7 +398,7 @@ _02243546: cmp r2, r3 blt _02243534 _0224354E: - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} thumb_func_end ov6_02243520 @@ -429,7 +429,7 @@ _0224357A: cmp r2, r3 blt _02243568 _02243582: - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} thumb_func_end ov6_02243554 @@ -489,7 +489,7 @@ _022435E8: cmp r2, r5 blt _022435AA _022435F0: - bl sub_02022974 + bl GF_AssertFail add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov6_02243588 @@ -521,7 +521,7 @@ _0224361E: cmp r2, r3 blt _0224360C _02243626: - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} thumb_func_end ov6_022435F8 @@ -552,7 +552,7 @@ _02243652: cmp r2, r3 blt _02243640 _0224365A: - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} thumb_func_end ov6_0224362C @@ -611,7 +611,7 @@ _022436BE: cmp r2, r5 blt _02243682 _022436C6: - bl sub_02022974 + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} ; .align 2, 0 @@ -672,7 +672,7 @@ _0224372E: cmp r2, r5 blt _022436F2 _02243736: - bl sub_02022974 + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} ; .align 2, 0 @@ -742,7 +742,7 @@ _0224375A: bl sub_02021B90 add r4, r0, #0 bne _022437C2 - bl sub_02022974 + bl GF_AssertFail _022437C2: add r0, r4, #0 add sp, #0x70 @@ -3576,7 +3576,7 @@ _02244CA2: bl sub_02021B90 add r4, r0, #0 bne _02244CCE - bl sub_02022974 + bl GF_AssertFail _02244CCE: add r0, r4, #0 add sp, #0x70 @@ -3739,7 +3739,7 @@ _02244DF4: _02244DFC: cmp r5, #4 blt _02244E04 - bl sub_02022974 + bl GF_AssertFail _02244E04: mov r0, #0x72 mov r5, #0 @@ -3775,7 +3775,7 @@ _02244E38: _02244E40: cmp r5, #4 blt _02244E48 - bl sub_02022974 + bl GF_AssertFail _02244E48: add r0, r6, #0 bl sub_02006CA8 @@ -3968,7 +3968,7 @@ ov6_02244F8C: ; 0x02244F8C ldr r0, [r4, r0] cmp r0, #0 beq _02244F9E - bl sub_02022974 + bl GF_AssertFail _02244F9E: ldr r0, _02244FB0 ; =ov6_02244FE4 add r1, r4, #0 @@ -3991,7 +3991,7 @@ ov6_02244FB4: ; 0x02244FB4 ldr r0, [r4, r0] cmp r0, #0 bne _02244FC6 - bl sub_02022974 + bl GF_AssertFail _02244FC6: mov r0, #0x86 lsl r0, r0, #2 @@ -4121,7 +4121,7 @@ ov6_0224509C: ; 0x0224509C bl sub_02018144 add r4, r0, #0 bne _022450B8 - bl sub_02022974 + bl GF_AssertFail _022450B8: mov r1, #0 add r0, r6, #0 @@ -4296,7 +4296,7 @@ _022451F6: _022451FE: cmp r0, #4 blt _02245206 - bl sub_02022974 + bl GF_AssertFail _02245206: mov r0, #0x1a lsl r0, r0, #4 @@ -4333,7 +4333,7 @@ _02245240: _02245248: cmp r0, #3 blt _02245250 - bl sub_02022974 + bl GF_AssertFail _02245250: mov r0, #0x69 lsl r0, r0, #2 @@ -4370,7 +4370,7 @@ _0224528A: _02245292: cmp r0, #4 blt _0224529A - bl sub_02022974 + bl GF_AssertFail _0224529A: pop {r3, r4, r5, pc} thumb_func_end ov6_022451B8 @@ -6061,7 +6061,7 @@ ov6_02245F44: ; 0x02245F44 bl sub_02018184 add r4, r0, #0 bne _02245F54 - bl sub_02022974 + bl GF_AssertFail _02245F54: add r0, r4, #0 mov r1, #0 diff --git a/asm/ov6_02246034.s b/asm/ov6_02246034.s index 9ac44cd352..b60ff06ca2 100644 --- a/asm/ov6_02246034.s +++ b/asm/ov6_02246034.s @@ -94,7 +94,7 @@ _022460E6: lsr r4, r0, #0x10 cmp r4, #0x64 blo _022460FE - bl sub_02022974 + bl GF_AssertFail _022460FE: cmp r4, #0x1e bhs _0224610C diff --git a/asm/ov6_02246184.s b/asm/ov6_02246184.s index 1a68281077..0ede20dc2a 100644 --- a/asm/ov6_02246184.s +++ b/asm/ov6_02246184.s @@ -14,7 +14,7 @@ ov6_02246184: ; 0x02246184 add r5, r0, #0 cmp r6, #4 blo _02246194 - bl sub_02022974 + bl GF_AssertFail _02246194: add r0, r5, #0 mov r1, #0x14 @@ -331,7 +331,7 @@ ov6_0224630C: ; 0x0224630C bl sub_02075E0C cmp r0, #0 beq _02246440 - bl sub_02022974 + bl GF_AssertFail _02246440: add sp, #0x14 pop {r4, r5, r6, r7, pc} diff --git a/asm/ov6_022465FC.s b/asm/ov6_022465FC.s index 79717ad37f..256aef6e87 100644 --- a/asm/ov6_022465FC.s +++ b/asm/ov6_022465FC.s @@ -83,7 +83,7 @@ ov6_0224663C: ; 0x0224663C cmp r4, #0xa blo _02246696 _02246692: - bl sub_02022974 + bl GF_AssertFail _02246696: add r0, r4, #0 add sp, #0xc @@ -107,7 +107,7 @@ ov6_0224669C: ; 0x0224669C ldrb r0, [r0] cmp r0, #6 blo _022466C0 - bl sub_02022974 + bl GF_AssertFail _022466C0: add r0, sp, #4 ldrb r0, [r0] @@ -484,7 +484,7 @@ ov6_02246958: ; 0x02246958 add r4, r0, #0 cmp r4, #9 bls _02246968 - bl sub_02022974 + bl GF_AssertFail _02246968: ldr r2, _02246974 ; =0x02249470 sub r1, r4, #1 @@ -521,7 +521,7 @@ _0224699E: ; jump table .short _022469D6 - _0224699E - 2 ; case 2 .short _022469DA - _0224699E - 2 ; case 3 _022469A6: - bl sub_02022974 + bl GF_AssertFail _022469AA: bl sub_02013960 cmp r0, #0 diff --git a/asm/ov6_02246B74.s b/asm/ov6_02246B74.s index 538b16204d..554b55040a 100644 --- a/asm/ov6_02246B74.s +++ b/asm/ov6_02246B74.s @@ -24,12 +24,12 @@ _02246B88: ldr r0, [sp, #4] cmp r0, #0 bne _02246B98 - bl sub_02022974 + bl GF_AssertFail _02246B98: ldr r0, [sp, #4] cmp r0, #0xc bls _02246BA2 - bl sub_02022974 + bl GF_AssertFail _02246BA2: ldr r0, [sp, #4] ldr r3, _02246BEC ; =0x0224954C diff --git a/asm/ov6_02246C24.s b/asm/ov6_02246C24.s index 46ae138fcc..fa4f2bc991 100644 --- a/asm/ov6_02246C24.s +++ b/asm/ov6_02246C24.s @@ -57,7 +57,7 @@ ov6_02246C24: ; 0x02246C24 add sp, #0x20 pop {r4, r5, r6, pc} _02246C90: - bl sub_02022974 + bl GF_AssertFail add sp, #0x20 pop {r4, r5, r6, pc} ; .align 2, 0 @@ -173,7 +173,7 @@ _02246D3C: bl sub_020552B4 cmp r0, #0 bne _02246D72 - bl sub_02022974 + bl GF_AssertFail _02246D72: ldr r0, [sp, #0x18] bl ov5_021E18BC diff --git a/asm/ov6_02246F00.s b/asm/ov6_02246F00.s index eeee0297a9..eadbff0988 100644 --- a/asm/ov6_02246F00.s +++ b/asm/ov6_02246F00.s @@ -31,7 +31,7 @@ ov6_02246F00: ; 0x02246F00 bl sub_02050944 pop {r4, r5, r6, pc} _02246F32: - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} ; .align 2, 0 _02246F38: .word 0x000001F2 @@ -101,7 +101,7 @@ _02246FA6: bl sub_020552B4 cmp r0, #0 bne _02246FBA - bl sub_02022974 + bl GF_AssertFail _02246FBA: ldr r0, [sp, #0x18] bl ov5_021E18BC @@ -137,7 +137,7 @@ _02246FEE: _02246FFC: cmp r1, #0 bne _02247004 - bl sub_02022974 + bl GF_AssertFail _02247004: ldrb r2, [r4, #1] ldr r0, [r6, #0x54] diff --git a/asm/ov6_02247078.s b/asm/ov6_02247078.s index 8294c6ddcd..cc69dcc86b 100644 --- a/asm/ov6_02247078.s +++ b/asm/ov6_02247078.s @@ -53,7 +53,7 @@ ov6_02247078: ; 0x02247078 add sp, #0x30 pop {r3, r4, r5, r6, r7, pc} _022470DA: - bl sub_02022974 + bl GF_AssertFail add sp, #0x30 pop {r3, r4, r5, r6, r7, pc} nop diff --git a/asm/ov6_02247100.s b/asm/ov6_02247100.s index 2557602e2b..e3bd3e6597 100644 --- a/asm/ov6_02247100.s +++ b/asm/ov6_02247100.s @@ -621,7 +621,7 @@ ov6_02247590: ; 0x02247590 bl sub_02018184 add r4, r0, #0 bne _022475A0 - bl sub_02022974 + bl GF_AssertFail _022475A0: add r0, r4, #0 mov r1, #0 diff --git a/asm/ov6_022475B0.s b/asm/ov6_022475B0.s index 767457e524..8953795aa8 100644 --- a/asm/ov6_022475B0.s +++ b/asm/ov6_022475B0.s @@ -48,7 +48,7 @@ _022475F2: lsr r5, r0, #0x10 cmp r5, #0x10 blo _02247602 - bl sub_02022974 + bl GF_AssertFail _02247602: lsl r0, r5, #2 ldr r0, [r4, r0] @@ -80,7 +80,7 @@ ov6_02247624: ; 0x02247624 ldr r0, _0224765C ; =0x0000FFFF cmp r1, r0 bne _02247640 - bl sub_02022974 + bl GF_AssertFail _02247640: mov r0, #0x6a mov r1, #8 diff --git a/asm/ov6_02247660.s b/asm/ov6_02247660.s index a86b094b52..7e4e654aa5 100644 --- a/asm/ov6_02247660.s +++ b/asm/ov6_02247660.s @@ -16,7 +16,7 @@ ov6_02247660: ; 0x02247660 lsr r4, r0, #0x10 cmp r4, #2 blo _02247676 - bl sub_02022974 + bl GF_AssertFail _02247676: cmp r4, #0 bne _02247680 @@ -89,7 +89,7 @@ _022476EA: str r0, [sp, #0x10] cmp r0, r1 blt _0224770C - bl sub_02022974 + bl GF_AssertFail _0224770C: lsr r2, r4, #0x1f lsl r1, r4, #0x1e diff --git a/asm/ov6_02247A0C.s b/asm/ov6_02247A0C.s index ce7d923df1..2e70872d90 100644 --- a/asm/ov6_02247A0C.s +++ b/asm/ov6_02247A0C.s @@ -374,7 +374,7 @@ _02247D22: sub r0, r4, r0 pop {r4, r5, r6, pc} _02247D26: - bl sub_02022974 + bl GF_AssertFail add r0, r4, #0 pop {r4, r5, r6, pc} ; .align 2, 0 diff --git a/asm/ov6_02247D30.s b/asm/ov6_02247D30.s index 2ba781af7c..dcfb25f53f 100644 --- a/asm/ov6_02247D30.s +++ b/asm/ov6_02247D30.s @@ -57,7 +57,7 @@ ov6_02247D30: ; 0x02247D30 add sp, #0x20 pop {r4, r5, r6, pc} _02247D9C: - bl sub_02022974 + bl GF_AssertFail add sp, #0x20 pop {r4, r5, r6, pc} ; .align 2, 0 diff --git a/asm/ov6_02248050.s b/asm/ov6_02248050.s index 4e65f2799f..2349221e07 100644 --- a/asm/ov6_02248050.s +++ b/asm/ov6_02248050.s @@ -49,7 +49,7 @@ _0224809C: add r5, r5, #1 b _022480A4 _022480A0: - bl sub_02022974 + bl GF_AssertFail _022480A4: mov r3, #2 lsl r1, r5, #0x10 @@ -106,7 +106,7 @@ _02248104: add r5, r5, #1 b _0224810C _02248108: - bl sub_02022974 + bl GF_AssertFail _0224810C: mov r3, #2 lsl r1, r5, #0x10 @@ -822,7 +822,7 @@ ov6_02248610: ; 0x02248610 add r5, r3, #0 cmp r0, #0 beq _02248628 - bl sub_02022974 + bl GF_AssertFail _02248628: add r0, r6, #0 add r1, sp, #0 @@ -1050,7 +1050,7 @@ _022487D0: add r1, #0xcc cmp r2, #0x10 blt _022487A4 - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} ; .align 2, 0 thumb_func_end ov6_02248798 diff --git a/asm/ov70_0225C9B4.s b/asm/ov70_0225C9B4.s index 91ce32ee0a..a3229ce40d 100644 --- a/asm/ov70_0225C9B4.s +++ b/asm/ov70_0225C9B4.s @@ -222,7 +222,7 @@ ov70_0225CB28: ; 0x0225CB28 bl ov70_0225C8D8 cmp r0, #0 bne _0225CB4A - bl sub_02022974 + bl GF_AssertFail _0225CB4A: add r3, sp, #4 ldrh r2, [r3, #2] @@ -432,7 +432,7 @@ ov70_0225CCB4: ; 0x0225CCB4 ldr r0, [r4, #0] cmp r0, #0 bne _0225CCC4 - bl sub_02022974 + bl GF_AssertFail _0225CCC4: add r1, sp, #8 ldrh r2, [r1, #4] @@ -499,7 +499,7 @@ ov70_0225CD34: ; 0x0225CD34 ldr r0, [r4, #0] cmp r0, #0 bne _0225CD44 - bl sub_02022974 + bl GF_AssertFail _0225CD44: ldr r0, [r4, #0] bl ov63_0222C0FC @@ -524,7 +524,7 @@ ov70_0225CD60: ; 0x0225CD60 add r4, r1, #0 cmp r0, #0 bne _0225CD70 - bl sub_02022974 + bl GF_AssertFail _0225CD70: ldr r0, [r5, #0] add r1, r4, #0 @@ -545,7 +545,7 @@ ov70_0225CD7C: ; 0x0225CD7C bl ov63_0222BF90 cmp r0, #0 beq _0225CD96 - bl sub_02022974 + bl GF_AssertFail _0225CD96: ldr r0, [r4, #0] mov r1, #4 @@ -599,7 +599,7 @@ ov70_0225CDEC: ; 0x0225CDEC add r5, r1, #0 cmp r4, #0xa blt _0225CDFC - bl sub_02022974 + bl GF_AssertFail _0225CDFC: ldrb r0, [r5, #0xb] lsl r1, r0, #2 @@ -726,7 +726,7 @@ _0225CEC6: cmp r1, r2 blt _0225CEB4 _0225CED0: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 add sp, #4 pop {r3, r4, pc} @@ -1309,7 +1309,7 @@ _0225D2E4: cmp r6, r0 blt _0225D2CE _0225D2EE: - bl sub_02022974 + bl GF_AssertFail mov r0, #0x28 ldr r1, [r5, #8] mul r0, r6 diff --git a/asm/ov70_0225D9A4.s b/asm/ov70_0225D9A4.s index 50b41839a5..5f1148fd80 100644 --- a/asm/ov70_0225D9A4.s +++ b/asm/ov70_0225D9A4.s @@ -46,7 +46,7 @@ ov70_0225D9A4: ; 0x0225D9A4 mvn r1, r1 cmp r0, r1 bne _0225DA02 - bl sub_02022974 + bl GF_AssertFail _0225DA02: mov r0, #1 bl sub_02002AC8 @@ -740,7 +740,7 @@ ov70_0225DF4C: ; 0x0225DF4C add r6, r2, #0 cmp r4, #0x14 blo _0225DF5C - bl sub_02022974 + bl GF_AssertFail _0225DF5C: add r0, r5, r4 strb r6, [r0, #0xc] @@ -764,7 +764,7 @@ ov70_0225DF6C: ; 0x0225DF6C add r6, r2, #0 cmp r4, #0x14 blo _0225DF7C - bl sub_02022974 + bl GF_AssertFail _0225DF7C: add r0, r5, r4 add r0, #0x20 @@ -1565,7 +1565,7 @@ ov70_0225E46C: ; 0x0225E46C add r5, r0, #0 cmp r4, #0x14 blo _0225E47A - bl sub_02022974 + bl GF_AssertFail _0225E47A: ldr r0, [r5, #0x34] add r1, r4, #0 @@ -1597,7 +1597,7 @@ ov70_0225E4AC: ; 0x0225E4AC add r5, r0, #0 cmp r4, #0x14 blo _0225E4BA - bl sub_02022974 + bl GF_AssertFail _0225E4BA: mov r0, #0xf5 lsl r0, r0, #2 @@ -2352,7 +2352,7 @@ ov70_0225EB08: ; 0x0225EB08 ldr r0, [r4, #0x1c] cmp r0, #0 beq _0225EB16 - bl sub_02022974 + bl GF_AssertFail _0225EB16: add r0, r4, #0 mov r1, #1 @@ -2709,7 +2709,7 @@ ov70_0225EDA8: ; 0x0225EDA8 add r6, r3, #0 cmp r0, #0 beq _0225EDBC - bl sub_02022974 + bl GF_AssertFail _0225EDBC: add r0, r4, #0 add r1, r7, #0 @@ -2801,13 +2801,13 @@ ov70_0225EE30: ; 0x0225EE30 add r7, r3, #0 cmp r0, #0 beq _0225EE46 - bl sub_02022974 + bl GF_AssertFail _0225EE46: ldrh r0, [r4, #0x12] lsl r0, r0, #1 cmp r0, #0x12 blt _0225EE52 - bl sub_02022974 + bl GF_AssertFail _0225EE52: add r3, r4, #0 add r2, r5, #0 @@ -3131,7 +3131,7 @@ ov70_0225F098: ; 0x0225F098 add r6, r2, #0 cmp r0, #0 beq _0225F0AA - bl sub_02022974 + bl GF_AssertFail _0225F0AA: mov r0, #2 add r1, r6, #0 @@ -4001,7 +4001,7 @@ _0225F710: mvn r1, r1 cmp r0, r1 bne _0225F72C - bl sub_02022974 + bl GF_AssertFail mov r0, #0 _0225F72C: add r1, sp, #0x44 @@ -4084,12 +4084,12 @@ ov70_0225F7A8: ; 0x0225F7A8 add r7, r3, #0 cmp r4, #0x1b blo _0225F7BA - bl sub_02022974 + bl GF_AssertFail _0225F7BA: ldrb r0, [r5, #1] cmp r0, #2 beq _0225F7C4 - bl sub_02022974 + bl GF_AssertFail _0225F7C4: ldrb r0, [r5, #1] cmp r0, #2 @@ -5063,12 +5063,12 @@ ov70_0225FEF0: ; 0x0225FEF0 str r2, [sp, #0x2c] cmp r0, #0x1b blo _0225FF06 - bl sub_02022974 + bl GF_AssertFail _0225FF06: ldr r0, [r5, #0x54] cmp r0, #0 beq _0225FF10 - bl sub_02022974 + bl GF_AssertFail _0225FF10: ldr r0, [sp, #0x90] mov r1, #3 @@ -5097,7 +5097,7 @@ _0225FF10: bl sub_0200A3DC cmp r0, #0 bne _0225FF52 - bl sub_02022974 + bl GF_AssertFail _0225FF52: ldr r0, [r5, #0x58] bl sub_02009D4C @@ -5118,7 +5118,7 @@ _0225FF52: bl sub_0200A640 cmp r0, #0 bne _0225FF82 - bl sub_02022974 + bl GF_AssertFail _0225FF82: ldr r0, [r5, #0x5c] bl sub_02009D4C @@ -5254,7 +5254,7 @@ ov70_02260080: ; 0x02260080 ldr r4, [sp, #0xa8] cmp r0, #0 beq _02260096 - bl sub_02022974 + bl GF_AssertFail _02260096: ldr r1, _02260224 ; =0x0226D724 mov r0, #0 @@ -5292,7 +5292,7 @@ _022600AA: bl sub_0200A3DC cmp r0, #0 bne _022600E4 - bl sub_02022974 + bl GF_AssertFail _022600E4: mov r1, #0x65 str r1, [sp] @@ -5315,7 +5315,7 @@ _022600E4: bl sub_0200A640 cmp r0, #0 bne _0226011A - bl sub_02022974 + bl GF_AssertFail _0226011A: ldr r0, [r6, #0x70] bl sub_02009D4C @@ -5777,7 +5777,7 @@ _02260458: bl sub_0200A640 cmp r0, #0 bne _02260496 - bl sub_02022974 + bl GF_AssertFail _02260496: add r0, r4, #0 add r0, #0xac @@ -5891,7 +5891,7 @@ _0226054A: bl sub_0200A3DC cmp r0, #0 bne _0226057E - bl sub_02022974 + bl GF_AssertFail _0226057E: add r0, r7, #0 add r0, #0xbc @@ -6373,7 +6373,7 @@ ov70_02260930: ; 0x02260930 ldr r4, [sp, #0x28] cmp r7, #3 blo _02260946 - bl sub_02022974 + bl GF_AssertFail _02260946: mov r0, #0 str r0, [sp] diff --git a/asm/ov70_02260B44.s b/asm/ov70_02260B44.s index 8a466fe07e..dded1dffc9 100644 --- a/asm/ov70_02260B44.s +++ b/asm/ov70_02260B44.s @@ -148,21 +148,21 @@ ov70_02260C50: ; 0x02260C50 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 bne _02260C5A - bl sub_02022974 + bl GF_AssertFail _02260C5A: mov r0, #0x12 lsl r0, r0, #4 ldr r0, [r5, r0] cmp r0, #0 bne _02260C68 - bl sub_02022974 + bl GF_AssertFail _02260C68: mov r0, #0x47 lsl r0, r0, #2 ldr r0, [r5, r0] cmp r0, #0 bne _02260C76 - bl sub_02022974 + bl GF_AssertFail _02260C76: mov r1, #0x4b lsl r1, r1, #2 @@ -394,11 +394,11 @@ ov70_02260E20: ; 0x02260E20 str r3, [sp] cmp r5, #2 ble _02260E34 - bl sub_02022974 + bl GF_AssertFail _02260E34: cmp r6, #3 ble _02260E3C - bl sub_02022974 + bl GF_AssertFail _02260E3C: add r0, r7, #0 bl ov70_02261718 @@ -827,16 +827,16 @@ ov70_0226111C: ; 0x0226111C add r7, r3, #0 cmp r5, #3 blt _02261130 - bl sub_02022974 + bl GF_AssertFail _02261130: cmp r7, #7 blt _02261138 - bl sub_02022974 + bl GF_AssertFail _02261138: ldrh r0, [r4, #2] cmp r0, #0x12 blo _02261142 - bl sub_02022974 + bl GF_AssertFail _02261142: ldrh r0, [r4, #2] mov r1, #0xc @@ -960,12 +960,12 @@ ov70_02261220: ; 0x02261220 add r5, r1, #0 cmp r4, #3 blt _02261230 - bl sub_02022974 + bl GF_AssertFail _02261230: ldrh r0, [r5, #2] cmp r0, #0x12 blo _0226123A - bl sub_02022974 + bl GF_AssertFail _0226123A: ldrh r1, [r5, #2] mov r0, #0xc @@ -1042,12 +1042,12 @@ ov70_022612B4: ; 0x022612B4 add r5, r1, #0 cmp r4, #3 blt _022612C4 - bl sub_02022974 + bl GF_AssertFail _022612C4: ldrh r0, [r5, #2] cmp r0, #0x12 blo _022612CE - bl sub_02022974 + bl GF_AssertFail _022612CE: ldrh r1, [r5, #2] mov r0, #0xc @@ -1078,12 +1078,12 @@ ov70_022612F0: ; 0x022612F0 add r7, r3, #0 cmp r4, #3 blt _02261302 - bl sub_02022974 + bl GF_AssertFail _02261302: ldrh r0, [r5, #2] cmp r0, #0x12 blo _0226130C - bl sub_02022974 + bl GF_AssertFail _0226130C: ldrh r1, [r5, #2] mov r0, #0xc @@ -1096,7 +1096,7 @@ _0226130C: ldr r0, [r1, r0] cmp r0, #0 bne _02261326 - bl sub_02022974 + bl GF_AssertFail _02261326: add r0, r5, r4 add r0, #0xbc @@ -1124,12 +1124,12 @@ ov70_02261348: ; 0x02261348 add r5, r0, #0 cmp r4, #3 blt _02261356 - bl sub_02022974 + bl GF_AssertFail _02261356: ldrh r0, [r5, #2] cmp r0, #0x12 blo _02261360 - bl sub_02022974 + bl GF_AssertFail _02261360: add r0, r5, r4 add r0, #0xb8 @@ -1144,12 +1144,12 @@ ov70_02261368: ; 0x02261368 add r5, r0, #0 cmp r4, #3 blt _02261376 - bl sub_02022974 + bl GF_AssertFail _02261376: ldrh r0, [r5, #2] cmp r0, #0x12 blo _02261380 - bl sub_02022974 + bl GF_AssertFail _02261380: lsl r0, r4, #2 add r0, r5, r0 @@ -1177,7 +1177,7 @@ ov70_02261398: ; 0x02261398 add r6, r2, #0 cmp r0, #0x12 blo _022613AA - bl sub_02022974 + bl GF_AssertFail _022613AA: ldrh r0, [r4, #2] lsl r0, r0, #4 @@ -1241,7 +1241,7 @@ ov70_022613F4: ; 0x022613F4 add r4, r0, r1 cmp r4, #0x19 blo _02261406 - bl sub_02022974 + bl GF_AssertFail _02261406: mov r0, #1 str r0, [sp] @@ -1719,7 +1719,7 @@ _0226173A: cmp r2, r4 blt _0226172C _02261742: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} ; .align 2, 0 @@ -2071,7 +2071,7 @@ _022619B8: str r0, [r1, #0] b _022619E4 _022619E0: - bl sub_02022974 + bl GF_AssertFail _022619E4: add r7, r7, #1 add r4, r4, #4 @@ -2103,12 +2103,12 @@ ov70_022619F4: ; 0x022619F4 ldrb r0, [r5, #1] cmp r0, #3 blo _02261A1E - bl sub_02022974 + bl GF_AssertFail _02261A1E: ldrb r0, [r5, #2] cmp r0, #2 blo _02261A28 - bl sub_02022974 + bl GF_AssertFail _02261A28: ldrb r1, [r5, #2] mov r0, #0xc @@ -2135,7 +2135,7 @@ _02261A28: bl NNS_G3dBindMdlSet cmp r0, #0 bne _02261A62 - bl sub_02022974 + bl GF_AssertFail _02261A62: ldr r7, [sp] mov r0, #0 @@ -2235,7 +2235,7 @@ _02261B10: cmp r1, r2 blt _02261B02 _02261B18: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} ; .align 2, 0 diff --git a/asm/ov70_02261E10.s b/asm/ov70_02261E10.s index 7e7c0a033a..634a39c1da 100644 --- a/asm/ov70_02261E10.s +++ b/asm/ov70_02261E10.s @@ -216,7 +216,7 @@ _02261F8C: ldrb r0, [r4, r0] cmp r0, #0x18 bls _02261FBA - bl sub_02022974 + bl GF_AssertFail _02261FBA: ldr r0, _02262188 ; =0x00000612 mov r1, #0 @@ -263,7 +263,7 @@ _02261FEA: ldrb r0, [r4, r0] cmp r0, #0x18 bls _0226201A - bl sub_02022974 + bl GF_AssertFail _0226201A: ldr r0, _02262188 ; =0x00000612 mov r1, #0 @@ -306,7 +306,7 @@ _02262048: ldrb r0, [r4, r0] cmp r0, #0x18 bls _02262072 - bl sub_02022974 + bl GF_AssertFail _02262072: ldr r0, _02262188 ; =0x00000612 mov r1, #0 @@ -337,7 +337,7 @@ _02262084: ldrb r0, [r4, r0] cmp r0, #0x18 bls _022620B2 - bl sub_02022974 + bl GF_AssertFail _022620B2: ldr r0, _02262188 ; =0x00000612 mov r1, #0 @@ -603,7 +603,7 @@ ov70_022622B0: ; 0x022622B0 add r6, r2, #0 cmp r0, r4 bhi _022622C6 - bl sub_02022974 + bl GF_AssertFail _022622C6: mov r0, #0xa lsl r0, r0, #0xe @@ -634,7 +634,7 @@ ov70_022622EC: ; 0x022622EC add r6, r2, #0 cmp r0, r4 bhi _02262300 - bl sub_02022974 + bl GF_AssertFail _02262300: lsl r0, r4, #2 add r1, r5, r0 @@ -659,11 +659,11 @@ ov70_02262318: ; 0x02262318 add r4, r3, #0 cmp r0, r6 bhi _0226232E - bl sub_02022974 + bl GF_AssertFail _0226232E: cmp r7, #3 blo _02262336 - bl sub_02022974 + bl GF_AssertFail _02262336: lsl r0, r6, #2 add r1, r5, r0 @@ -704,7 +704,7 @@ ov70_02262374: ; 0x02262374 ldrb r0, [r5, r0] cmp r0, r4 bhi _02262386 - bl sub_02022974 + bl GF_AssertFail _02262386: lsl r0, r4, #2 add r1, r5, r0 @@ -726,7 +726,7 @@ ov70_0226239C: ; 0x0226239C ldrb r0, [r5, r0] cmp r0, r4 bhi _022623AE - bl sub_02022974 + bl GF_AssertFail _022623AE: lsl r0, r4, #2 add r1, r5, r0 @@ -749,7 +749,7 @@ ov70_022623C4: ; 0x022623C4 add r6, r2, #0 cmp r0, r4 bhi _022623D8 - bl sub_02022974 + bl GF_AssertFail _022623D8: lsl r0, r4, #2 add r1, r5, r0 @@ -773,7 +773,7 @@ ov70_022623F0: ; 0x022623F0 add r6, r2, #0 cmp r0, r4 bhi _02262404 - bl sub_02022974 + bl GF_AssertFail _02262404: lsl r0, r4, #2 add r1, r5, r0 @@ -796,7 +796,7 @@ ov70_0226241C: ; 0x0226241C ldrb r0, [r5, r0] cmp r0, r4 bhi _0226242E - bl sub_02022974 + bl GF_AssertFail _0226242E: lsl r0, r4, #2 add r1, r5, r0 @@ -818,7 +818,7 @@ ov70_02262444: ; 0x02262444 ldrb r0, [r5, r0] cmp r0, r4 bhi _02262456 - bl sub_02022974 + bl GF_AssertFail _02262456: lsl r0, r4, #2 add r1, r5, r0 @@ -1472,7 +1472,7 @@ ov70_02262908: ; 0x02262908 beq _02262922 cmp r4, #0xc beq _02262922 - bl sub_02022974 + bl GF_AssertFail _02262922: sub r4, #0xb cmp r4, #1 @@ -1499,7 +1499,7 @@ ov70_02262938: ; 0x02262938 beq _02262952 cmp r4, #0xc beq _02262952 - bl sub_02022974 + bl GF_AssertFail _02262952: sub r4, #0xb cmp r4, #1 @@ -1923,7 +1923,7 @@ _02262C34: strh r0, [r4, #4] pop {r4, pc} _02262C5E: - bl sub_02022974 + bl GF_AssertFail _02262C62: pop {r4, pc} thumb_func_end ov70_02262BEC @@ -2010,7 +2010,7 @@ _02262CDC: strh r0, [r4, #4] pop {r4, pc} _02262D06: - bl sub_02022974 + bl GF_AssertFail _02262D0A: pop {r4, pc} thumb_func_end ov70_02262C94 @@ -2054,7 +2054,7 @@ ov70_02262D48: ; 0x02262D48 beq _02262D5C cmp r4, #0x5d beq _02262D5C - bl sub_02022974 + bl GF_AssertFail _02262D5C: add r0, r5, #0 bl ov70_022610E4 diff --git a/asm/ov70_02262DA8.s b/asm/ov70_02262DA8.s index f99501614c..39b4753cdc 100644 --- a/asm/ov70_02262DA8.s +++ b/asm/ov70_02262DA8.s @@ -101,7 +101,7 @@ ov70_02262E3C: ; 0x02262E3C add r4, r1, #0 cmp r0, #0 beq _02262E4C - bl sub_02022974 + bl GF_AssertFail _02262E4C: ldrh r0, [r5] add r1, r4, #0 @@ -122,7 +122,7 @@ ov70_02262E64: ; 0x02262E64 ldr r0, [r4, #8] cmp r0, #0 bne _02262E72 - bl sub_02022974 + bl GF_AssertFail _02262E72: ldr r0, [r4, #8] bl sub_020181C4 @@ -167,11 +167,11 @@ ov70_02262E94: ; 0x02262E94 add r7, r3, #0 cmp r5, #0 bne _02262EA6 - bl sub_02022974 + bl GF_AssertFail _02262EA6: cmp r4, #0x14 blo _02262EAE - bl sub_02022974 + bl GF_AssertFail _02262EAE: mov r0, #0x24 add r5, #8 @@ -192,11 +192,11 @@ ov70_02262EC0: ; 0x02262EC0 add r7, r3, #0 cmp r5, #0 bne _02262ED2 - bl sub_02022974 + bl GF_AssertFail _02262ED2: cmp r4, #0x14 blo _02262EDA - bl sub_02022974 + bl GF_AssertFail _02262EDA: mov r0, #0x24 add r5, #8 @@ -216,11 +216,11 @@ ov70_02262EEC: ; 0x02262EEC add r6, r2, #0 cmp r5, #0 bne _02262EFC - bl sub_02022974 + bl GF_AssertFail _02262EFC: cmp r4, #0x14 blo _02262F04 - bl sub_02022974 + bl GF_AssertFail _02262F04: mov r0, #0x24 add r5, #8 @@ -328,7 +328,7 @@ _02262FB2: ldr r4, [r0, #4] b _02262FBC _02262FB8: - bl sub_02022974 + bl GF_AssertFail _02262FBC: cmp r4, #0 beq _02262FD2 @@ -354,12 +354,12 @@ ov70_02262FD4: ; 0x02262FD4 bl ov70_0226306C cmp r0, #1 beq _02262FEA - bl sub_02022974 + bl GF_AssertFail _02262FEA: ldr r0, [r5, #8] cmp r0, #0 beq _02262FF4 - bl sub_02022974 + bl GF_AssertFail _02262FF4: mov r3, #0 add r0, r5, #4 @@ -388,7 +388,7 @@ ov70_0226300C: ; 0x0226300C bl ov70_0226306C cmp r0, #1 beq _02263022 - bl sub_02022974 + bl GF_AssertFail _02263022: add r2, r5, #0 add r3, r5, #4 @@ -415,7 +415,7 @@ ov70_02263044: ; 0x02263044 ldr r0, [r4, #8] cmp r0, #0 beq _02263052 - bl sub_02022974 + bl GF_AssertFail _02263052: add r3, r4, #0 add r3, #0x14 diff --git a/asm/ov70_022630A4.s b/asm/ov70_022630A4.s index a52ad49bd6..d066a8ea7f 100644 --- a/asm/ov70_022630A4.s +++ b/asm/ov70_022630A4.s @@ -25,7 +25,7 @@ ov70_022630A4: ; 0x022630A4 ldrh r0, [r4, #6] cmp r0, #4 blo _022630D4 - bl sub_02022974 + bl GF_AssertFail _022630D4: ldrh r2, [r4, #6] ldr r3, _022630E8 ; =0x0226DA78 @@ -187,7 +187,7 @@ _022631E6: cmp r0, #3 bne _02263184 _022631F0: - bl sub_02022974 + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov70_0226315C @@ -2265,7 +2265,7 @@ _022643BE: str r0, [r4, #8] b _022643CC _022643C4: - bl sub_02022974 + bl GF_AssertFail mov r0, #5 str r0, [r4, #8] _022643CC: @@ -2316,7 +2316,7 @@ _0226442A: bl ov66_02232A48 cmp r0, #0 bne _02264438 - bl sub_02022974 + bl GF_AssertFail _02264438: add r0, r5, #0 bl ov70_02262E8C @@ -2453,7 +2453,7 @@ _02264542: str r0, [sp, #0x18] b _0226454C _02264548: - bl sub_02022974 + bl GF_AssertFail _0226454C: ldr r0, [sp, #0x24] ldr r1, [sp, #0x18] @@ -2537,7 +2537,7 @@ _022645EA: str r0, [sp, #0x14] b _022645F4 _022645F0: - bl sub_02022974 + bl GF_AssertFail _022645F4: ldr r0, [sp, #0x28] ldr r2, [sp, #0x14] @@ -2717,7 +2717,7 @@ _02264768: strb r0, [r5, #3] b _02264778 _02264774: - bl sub_02022974 + bl GF_AssertFail _02264778: add r0, r4, #0 bl ov70_0225DEE8 @@ -3176,7 +3176,7 @@ _02264B28: bl ov70_02262E94 b _02264B5A _02264B56: - bl sub_02022974 + bl GF_AssertFail _02264B5A: mov r0, #0 add sp, #0x18 @@ -3240,7 +3240,7 @@ _02264BBE: mov r0, #1 pop {r3, pc} _02264BC2: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -3301,7 +3301,7 @@ _02264C26: mov r0, #7 pop {r3, pc} _02264C2A: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -3362,7 +3362,7 @@ _02264C8E: mov r0, #6 pop {r3, pc} _02264C92: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -3523,7 +3523,7 @@ _02264DD6: strh r0, [r4, #6] b _02264DE0 _02264DDC: - bl sub_02022974 + bl GF_AssertFail _02264DE0: add r0, r6, #0 mov r1, #1 @@ -4791,7 +4791,7 @@ _0226588A: str r0, [r4, #4] cmp r0, r1 bne _022658B4 - bl sub_02022974 + bl GF_AssertFail _022658B4: add r2, r4, #0 ldr r0, [r4, #4] @@ -5455,7 +5455,7 @@ _02265E30: bl ov70_0225CF4C cmp r0, #1 beq _02265E44 - bl sub_02022974 + bl GF_AssertFail _02265E44: ldr r0, [sp, #0x20] bl ov63_0222C0AC diff --git a/asm/ov70_02265F38.s b/asm/ov70_02265F38.s index d838111942..ddbd1fa4f9 100644 --- a/asm/ov70_02265F38.s +++ b/asm/ov70_02265F38.s @@ -1299,7 +1299,7 @@ _02266A44: mov r4, #2 b _02266A54 _02266A4A: - bl sub_02022974 + bl GF_AssertFail add sp, #8 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -1580,7 +1580,7 @@ ov70_02266C68: ; 0x02266C68 add r6, r2, #0 cmp r4, #2 blo _02266C7A - bl sub_02022974 + bl GF_AssertFail _02266C7A: mov r0, #0 strb r0, [r5] @@ -1697,7 +1697,7 @@ _02266D32: mov r6, #2 b _02266D3C _02266D36: - bl sub_02022974 + bl GF_AssertFail mov r6, #2 _02266D3C: add r0, r6, #0 diff --git a/asm/ov70_02266E9C.s b/asm/ov70_02266E9C.s index c2d7a6de1f..6b461266cb 100644 --- a/asm/ov70_02266E9C.s +++ b/asm/ov70_02266E9C.s @@ -3262,7 +3262,7 @@ _02268A9A: mov r0, #2 pop {r3, pc} _02268AA0: - bl sub_02022974 + bl GF_AssertFail mov r0, #1 add sp, #8 pop {r3, pc} @@ -3363,7 +3363,7 @@ ov70_02268B50: ; 0x02268B50 add r4, r1, #0 cmp r6, r0 bne _02268B64 - bl sub_02022974 + bl GF_AssertFail _02268B64: strb r6, [r5, #3] add r0, r4, #0 @@ -4144,7 +4144,7 @@ ov70_0226911C: ; 0x0226911C add r6, r3, #0 cmp r0, #0 beq _02269130 - bl sub_02022974 + bl GF_AssertFail _02269130: mov r0, #1 strh r0, [r5] diff --git a/asm/ov70_02269190.s b/asm/ov70_02269190.s index 692278803c..c128cfa8ad 100644 --- a/asm/ov70_02269190.s +++ b/asm/ov70_02269190.s @@ -124,7 +124,7 @@ ov70_02269268: ; 0x02269268 add r6, r2, #0 cmp r4, #0x14 blo _02269278 - bl sub_02022974 + bl GF_AssertFail _02269278: ldr r0, [r5, #4] add r1, r4, #0 @@ -766,7 +766,7 @@ ov70_02269738: ; 0x02269738 add r6, r2, #0 cmp r7, #0x1b blo _0226974A - bl sub_02022974 + bl GF_AssertFail _0226974A: add r0, r5, #0 add r1, r4, #0 @@ -810,7 +810,7 @@ ov70_0226978C: ; 0x0226978C ldrb r0, [r4] cmp r0, #0x1b blo _022697A6 - bl sub_02022974 + bl GF_AssertFail _022697A6: ldrb r2, [r4] add r0, r5, #0 @@ -845,7 +845,7 @@ _022697DC: ldrb r0, [r4] cmp r0, #0x1b blo _022697E6 - bl sub_02022974 + bl GF_AssertFail _022697E6: add r0, r5, #0 add r1, r4, #0 @@ -905,7 +905,7 @@ ov70_02269828: ; 0x02269828 add r6, r3, #0 cmp r4, #0x12 blo _0226983C - bl sub_02022974 + bl GF_AssertFail _0226983C: ldr r0, _02269870 ; =0x0000087C add r7, r5, r0 @@ -914,7 +914,7 @@ _0226983C: ldr r0, [r7, r0] cmp r0, #0 beq _0226984E - bl sub_02022974 + bl GF_AssertFail _0226984E: ldr r0, [sp, #4] ldr r2, _02269874 ; =0x00010550 @@ -950,7 +950,7 @@ ov70_02269878: ; 0x02269878 ldr r0, [r1, r0] cmp r0, #0 bne _02269894 - bl sub_02022974 + bl GF_AssertFail _02269894: mov r0, #0x78 add r6, r5, #0 @@ -989,7 +989,7 @@ _02269894: bl NNS_G3dForceBindMdlTex cmp r0, #0 bne _022698E8 - bl sub_02022974 + bl GF_AssertFail _022698E8: ldr r0, [sp, #0xc] ldr r1, [sp, #0xc] @@ -1000,7 +1000,7 @@ _022698E8: bl NNS_G3dForceBindMdlPltt cmp r0, #0 bne _02269900 - bl sub_02022974 + bl GF_AssertFail _02269900: ldr r0, [sp, #4] lsl r1, r5, #3 @@ -2760,7 +2760,7 @@ ov70_0226A6C8: ; 0x0226A6C8 ldrb r0, [r0, #2] cmp r0, #0x11 bne _0226A6DE - bl sub_02022974 + bl GF_AssertFail _0226A6DE: ldr r0, _0226A814 ; =0x00000954 ldr r1, [r5, r0] @@ -5501,13 +5501,13 @@ _0226BCDC: ldrb r7, [r6, #2] cmp r7, #4 blo _0226BCFE - bl sub_02022974 + bl GF_AssertFail _0226BCFE: ldrb r0, [r6, #3] str r0, [sp, #4] cmp r0, #4 bls _0226BD0A - bl sub_02022974 + bl GF_AssertFail _0226BD0A: mov r0, #0xec mul r0, r7 @@ -5569,7 +5569,7 @@ ov70_0226BD64: ; 0x0226BD64 add r7, r3, #0 cmp r0, #3 blo _0226BD78 - bl sub_02022974 + bl GF_AssertFail _0226BD78: add r0, r5, #0 add r0, #0xd8 diff --git a/asm/ov70_0226C60C.s b/asm/ov70_0226C60C.s index 5156b94aa7..9c17dcb28e 100644 --- a/asm/ov70_0226C60C.s +++ b/asm/ov70_0226C60C.s @@ -262,7 +262,7 @@ _0226C83C: sub r0, r0, #1 pop {r3, pc} _0226C840: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} thumb_func_end ov70_0226C81C @@ -294,7 +294,7 @@ _0226C870: sub r0, r0, #7 pop {r3, pc} _0226C874: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} thumb_func_end ov70_0226C848 @@ -321,7 +321,7 @@ _0226C89A: sub r0, #0xb pop {r3, pc} _0226C89E: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 diff --git a/asm/ov70_0226C8B4.s b/asm/ov70_0226C8B4.s index 1c1dea71a8..fdc4dccac2 100644 --- a/asm/ov70_0226C8B4.s +++ b/asm/ov70_0226C8B4.s @@ -118,7 +118,7 @@ ov70_0226C984: ; 0x0226C984 add r6, r2, #0 cmp r4, #6 blo _0226C994 - bl sub_02022974 + bl GF_AssertFail _0226C994: cmp r4, #6 bhs _0226C9A4 @@ -195,7 +195,7 @@ _0226C9F4: add r6, r0, #0 cmp r6, #1 beq _0226CA1C - bl sub_02022974 + bl GF_AssertFail b _0226CA1C _0226CA16: mov r6, #0 @@ -254,7 +254,7 @@ _0226CA6C: bl ov70_02262754 cmp r0, #1 beq _0226CA82 - bl sub_02022974 + bl GF_AssertFail _0226CA82: ldr r0, [sp, #8] add r4, r4, #1 @@ -279,7 +279,7 @@ _0226CA9E: bl ov70_02262754 cmp r0, #1 beq _0226CAB4 - bl sub_02022974 + bl GF_AssertFail _0226CAB4: ldr r0, [sp, #8] add r4, r4, #1 @@ -342,7 +342,7 @@ ov70_0226CB1C: ; 0x0226CB1C add r6, r2, #0 cmp r4, #6 blo _0226CB2C - bl sub_02022974 + bl GF_AssertFail _0226CB2C: cmp r4, #6 bhs _0226CB4C @@ -492,7 +492,7 @@ _0226CC10: str r0, [r1, #0] pop {r3, pc} _0226CC1A: - bl sub_02022974 + bl GF_AssertFail pop {r3, pc} ; .align 2, 0 _0226CC20: .word 0x0226E6CC diff --git a/asm/ov70_0226CC74.s b/asm/ov70_0226CC74.s index 5bbbf64b81..25065c6f2b 100644 --- a/asm/ov70_0226CC74.s +++ b/asm/ov70_0226CC74.s @@ -209,7 +209,7 @@ _0226CE32: bl ov70_02262E88 b _0226CE4A _0226CE46: - bl sub_02022974 + bl GF_AssertFail _0226CE4A: mov r0, #0 add sp, #0x10 diff --git a/asm/ov70_0226CE54.s b/asm/ov70_0226CE54.s index 5cf86a9d39..a04b7daf47 100644 --- a/asm/ov70_0226CE54.s +++ b/asm/ov70_0226CE54.s @@ -225,11 +225,11 @@ ov70_0226CFFC: ; 0x0226CFFC add r4, r2, #0 cmp r5, #9 blo _0226D00C - bl sub_02022974 + bl GF_AssertFail _0226D00C: cmp r4, #3 blt _0226D014 - bl sub_02022974 + bl GF_AssertFail _0226D014: lsl r0, r5, #1 add r0, r5, r0 @@ -564,7 +564,7 @@ ov70_0226D2A0: ; 0x0226D2A0 add r7, r3, #0 cmp r4, #2 blo _0226D2B2 - bl sub_02022974 + bl GF_AssertFail _0226D2B2: ldrh r0, [r5] cmp r0, #1 diff --git a/asm/ov71_0223B140.s b/asm/ov71_0223B140.s index ca8bf76174..9063a001e6 100644 --- a/asm/ov71_0223B140.s +++ b/asm/ov71_0223B140.s @@ -1086,7 +1086,7 @@ _0223BA14: ldr r0, [r5, r1] cmp r0, #0 bne _0223BA2E - bl sub_02022974 + bl GF_AssertFail _0223BA2E: ldr r1, _0223BBCC ; =0x000030B8 ldr r0, [r5, r1] @@ -1095,7 +1095,7 @@ _0223BA2E: bl NNS_G2dGetUnpackedBGCharacterData cmp r0, #0 bne _0223BA42 - bl sub_02022974 + bl GF_AssertFail _0223BA42: mov r0, #0 mvn r0, r0 @@ -1154,7 +1154,7 @@ _0223BA9A: ldr r0, [r5, r1] cmp r0, #0 bne _0223BABA - bl sub_02022974 + bl GF_AssertFail _0223BABA: ldr r1, _0223BBCC ; =0x000030B8 ldr r0, [r5, r1] @@ -1163,7 +1163,7 @@ _0223BABA: bl NNS_G2dGetUnpackedBGCharacterData cmp r0, #0 bne _0223BACE - bl sub_02022974 + bl GF_AssertFail _0223BACE: ldr r3, _0223BBD0 ; =0x000032FC mov r0, #0x19 @@ -2086,7 +2086,7 @@ ov71_0223C1AC: ; 0x0223C1AC add r6, r0, #0 cmp r7, r6 bls _0223C20C - bl sub_02022974 + bl GF_AssertFail _0223C20C: cmp r7, r6 bhs _0223C278 @@ -2378,7 +2378,7 @@ _0223C432: mov r0, #4 pop {r3, pc} _0223C43A: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 diff --git a/asm/ov71_0223C69C.s b/asm/ov71_0223C69C.s index 6a39c72398..8b215a3695 100644 --- a/asm/ov71_0223C69C.s +++ b/asm/ov71_0223C69C.s @@ -880,7 +880,7 @@ ov71_0223CDE8: ; 0x0223CDE8 ldr r0, [r5, #0x18] cmp r0, #0 bne _0223CDFA - bl sub_02022974 + bl GF_AssertFail _0223CDFA: ldr r0, [r5, #0x18] bl sub_0202CC58 diff --git a/asm/ov71_0223CF0C.s b/asm/ov71_0223CF0C.s index 61051a4ef3..653bc53b1f 100644 --- a/asm/ov71_0223CF0C.s +++ b/asm/ov71_0223CF0C.s @@ -153,10 +153,10 @@ _0223D012: lsl r0, r0, #4 ldr r0, [r5, r0] bl sub_020181C4 - bl sub_02022974 + bl GF_AssertFail b _0223D050 _0223D04C: - bl sub_02022974 + bl GF_AssertFail _0223D050: add r0, r4, #1 lsl r0, r0, #0x18 @@ -446,11 +446,11 @@ ov71_0223D298: ; 0x0223D298 add r6, r2, #0 cmp r4, #8 blo _0223D2AA - bl sub_02022974 + bl GF_AssertFail _0223D2AA: cmp r6, #3 bls _0223D2B2 - bl sub_02022974 + bl GF_AssertFail _0223D2B2: lsl r7, r4, #2 mov r0, #0x57 diff --git a/asm/ov72_0223D7A0.s b/asm/ov72_0223D7A0.s index 47742fd43c..a61e74afdb 100644 --- a/asm/ov72_0223D7A0.s +++ b/asm/ov72_0223D7A0.s @@ -2320,7 +2320,7 @@ _0223E9FE: lsl r0, r0, #0xa cmp r7, r0 blt _0223EA0A - bl sub_02022974 + bl GF_AssertFail _0223EA0A: mov r0, #6 add r6, r6, #1 diff --git a/asm/ov76_0223B140.s b/asm/ov76_0223B140.s index c93d11d2b7..e924d3693e 100644 --- a/asm/ov76_0223B140.s +++ b/asm/ov76_0223B140.s @@ -568,7 +568,7 @@ ov76_0223B52C: ; 0x0223B52C ldr r1, [r2, r1] cmp r1, #1 bne _0223B558 - bl sub_02022974 + bl GF_AssertFail add sp, #0x34 mov r0, #0 pop {r4, r5, r6, r7, pc} @@ -708,7 +708,7 @@ _0223B666: str r0, [r4, #0] b _0223B672 _0223B66E: - bl sub_02022974 + bl GF_AssertFail _0223B672: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} diff --git a/asm/ov76_0223B870.s b/asm/ov76_0223B870.s index 0b763435dc..fdc0c9abff 100644 --- a/asm/ov76_0223B870.s +++ b/asm/ov76_0223B870.s @@ -875,11 +875,11 @@ ov76_0223BF10: ; 0x0223BF10 add r5, r0, #0 cmp r4, #0 bne _0223BF38 - bl sub_02022974 + bl GF_AssertFail _0223BF38: cmp r5, #0 bne _0223BF40 - bl sub_02022974 + bl GF_AssertFail _0223BF40: bl sub_02014000 pop {r3, r4, r5, pc} @@ -1497,7 +1497,7 @@ ov76_0223C398: ; 0x0223C398 bl sub_0200C7C0 cmp r0, #0 bne _0223C402 - bl sub_02022974 + bl GF_AssertFail _0223C402: ldr r0, [r4, #8] ldr r1, [r4, #0xc] @@ -1505,7 +1505,7 @@ _0223C402: bl sub_0200CB30 cmp r0, #0 bne _0223C414 - bl sub_02022974 + bl GF_AssertFail _0223C414: add sp, #0x4c pop {r3, r4, r5, r6, pc} diff --git a/asm/ov76_0223D338.s b/asm/ov76_0223D338.s index 13b329c18d..f632fa9934 100644 --- a/asm/ov76_0223D338.s +++ b/asm/ov76_0223D338.s @@ -828,7 +828,7 @@ _0223D976: bl sub_0200D3CC pop {r3, pc} _0223D97E: - bl sub_02022974 + bl GF_AssertFail pop {r3, pc} thumb_func_end ov76_0223D94C @@ -1202,7 +1202,7 @@ _0223DC50: bl sub_02005748 pop {r4, r5, r6, pc} _0223DC80: - bl sub_02022974 + bl GF_AssertFail _0223DC84: pop {r4, r5, r6, pc} nop diff --git a/asm/ov77_021D25B0.s b/asm/ov77_021D25B0.s index c954b00a55..0a566b2c42 100644 --- a/asm/ov77_021D25B0.s +++ b/asm/ov77_021D25B0.s @@ -1044,7 +1044,7 @@ _021D2E32: mov r0, #1 pop {r3, r4, r5, pc} _021D2E3E: - bl sub_02022974 + bl GF_AssertFail _021D2E42: ldr r0, [r5, #8] cmp r0, #0 @@ -1566,7 +1566,7 @@ _021D3286: ldr r0, [r4, #8] cmp r0, #0 bne _021D3296 - bl sub_02022974 + bl GF_AssertFail _021D3296: ldr r0, [r4, #0x28] bl sub_0200DA58 @@ -3039,13 +3039,13 @@ ov77_021D3EDC: ; 0x021D3EDC bl sub_0201CBCC cmp r0, #0 bne _021D3F02 - bl sub_02022974 + bl GF_AssertFail _021D3F02: ldr r0, [r4, #0x24] ldr r0, [r0, #0x14] cmp r0, #0 bne _021D3F0E - bl sub_02022974 + bl GF_AssertFail _021D3F0E: ldr r2, [r4, #0x24] ldr r0, [r4, #0x20] @@ -3111,7 +3111,7 @@ _021D3F5E: bl sub_0201CBB0 cmp r0, #0 bne _021D3F90 - bl sub_02022974 + bl GF_AssertFail _021D3F90: add r0, r5, r6 add r0, #0x80 @@ -3120,7 +3120,7 @@ _021D3F90: ldrb r0, [r0, #9] cmp r0, #1 beq _021D3FA4 - bl sub_02022974 + bl GF_AssertFail _021D3FA4: add r0, r5, r6 add r0, #0x80 @@ -3151,7 +3151,7 @@ _021D3FD2: _021D3FD4: cmp r4, #0 bne _021D3FDC - bl sub_02022974 + bl GF_AssertFail _021D3FDC: ldr r0, [sp, #0xc] add r1, r4, #0 @@ -3573,7 +3573,7 @@ _021D4336: bl sub_0200F2AC cmp r0, #1 beq _021D4348 - bl sub_02022974 + bl GF_AssertFail _021D4348: ldr r0, _021D45F0 ; =0x00000247 mov r2, #4 @@ -3611,7 +3611,7 @@ _021D4368: bl sub_02014710 cmp r0, #0 beq _021D439A - bl sub_02022974 + bl GF_AssertFail _021D439A: ldr r0, _021D45F8 ; =0x000003B1 cmp r5, r0 @@ -5261,7 +5261,7 @@ _021D519A: bl sub_0200F2AC cmp r0, #1 beq _021D51A6 - bl sub_02022974 + bl GF_AssertFail _021D51A6: add r0, r5, #0 bl ov77_021D35B8 @@ -5288,7 +5288,7 @@ _021D51D0: bl ov77_021D40DC cmp r0, #1 beq _021D51E0 - bl sub_02022974 + bl GF_AssertFail _021D51E0: mov r0, #4 str r0, [sp] @@ -5320,7 +5320,7 @@ _021D5216: bl sub_0200F2AC cmp r0, #1 beq _021D5222 - bl sub_02022974 + bl GF_AssertFail _021D5222: add r0, r5, #0 bl ov77_021D35B8 diff --git a/asm/ov77_021D6670.s b/asm/ov77_021D6670.s index e430f75b7b..cde2ac0c60 100644 --- a/asm/ov77_021D6670.s +++ b/asm/ov77_021D6670.s @@ -168,7 +168,7 @@ ov77_021D6794: ; 0x021D6794 add r4, r1, #0 cmp r4, r0 blt _021D67A4 - bl sub_02022974 + bl GF_AssertFail _021D67A4: mov r0, #0xc ldr r1, [r5, #4] @@ -606,7 +606,7 @@ _021D6AFA: lsr r4, r1, #0x18 cmp r4, #0xa blo _021D6AE2 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} thumb_func_end ov77_021D6ADC diff --git a/asm/ov77_021D6C70.s b/asm/ov77_021D6C70.s index 76e54c202e..65454e5c2a 100644 --- a/asm/ov77_021D6C70.s +++ b/asm/ov77_021D6C70.s @@ -17,7 +17,7 @@ ov77_021D6C70: ; 0x021D6C70 bl sub_020145B4 cmp r4, #0 bne _021D6C88 - bl sub_02022974 + bl GF_AssertFail _021D6C88: lsl r0, r4, #0x10 lsr r0, r0, #0xd @@ -35,7 +35,7 @@ ov77_021D6C94: ; 0x021D6C94 blx r3 add r4, r0, #0 bne _021D6CA6 - bl sub_02022974 + bl GF_AssertFail _021D6CA6: add r0, r4, #0 bl sub_020145F4 @@ -61,7 +61,7 @@ ov77_021D6CBC: ; 0x021D6CBC cmp r0, #0 bne _021D6CCC _021D6CC8: - bl sub_02022974 + bl GF_AssertFail _021D6CCC: ldr r0, [r4, #0x18] pop {r4, pc} @@ -78,7 +78,7 @@ ov77_021D6CD0: ; 0x021D6CD0 cmp r0, #0 bne _021D6CE4 _021D6CE0: - bl sub_02022974 + bl GF_AssertFail _021D6CE4: ldr r0, [r5, #0x18] mov r1, #1 diff --git a/asm/ov78_021D0D80.s b/asm/ov78_021D0D80.s index 6650d81790..115c64fee8 100644 --- a/asm/ov78_021D0D80.s +++ b/asm/ov78_021D0D80.s @@ -22,7 +22,7 @@ ov78_021D0D80: ; 0x021D0D80 bl sub_0200681C add r5, r0, #0 bne _021D0DA4 - bl sub_02022974 + bl GF_AssertFail _021D0DA4: ldr r2, _021D0EE4 ; =0x000006B4 add r0, r5, #0 @@ -57,7 +57,7 @@ _021D0DA4: bl sub_0201E450 cmp r0, #1 beq _021D0DFE - bl sub_02022974 + bl GF_AssertFail _021D0DFE: mov r0, #1 bl sub_02002AC8 @@ -263,7 +263,7 @@ ov78_021D0FA8: ; 0x021D0FA8 bl sub_0201E530 cmp r0, #1 beq _021D0FDA - bl sub_02022974 + bl GF_AssertFail _021D0FDA: mov r0, #0x65 lsl r0, r0, #4 @@ -2340,7 +2340,7 @@ ov78_021D1FB4: ; 0x021D1FB4 bl sub_0200B144 add r4, r0, #0 bne _021D1FD0 - bl sub_02022974 + bl GF_AssertFail _021D1FD0: add r0, r4, #0 add r1, r6, #0 @@ -2388,7 +2388,7 @@ ov78_021D201C: ; 0x021D201C str r3, [sp, #0x10] cmp r0, #0 beq _021D2034 - bl sub_02022974 + bl GF_AssertFail _021D2034: mov r0, #0 mov r1, #0x1a @@ -2397,7 +2397,7 @@ _021D2034: bl sub_0200B144 add r6, r0, #0 bne _021D2048 - bl sub_02022974 + bl GF_AssertFail _021D2048: ldr r1, [sp, #0x10] add r0, r6, #0 @@ -2540,7 +2540,7 @@ ov78_021D213C: ; 0x021D213C add r6, r2, #0 cmp r0, #0 beq _021D214E - bl sub_02022974 + bl GF_AssertFail _021D214E: ldr r1, _021D2190 ; =0xFFFFEAAB ldr r2, _021D2194 ; =0xFFFFDC72 @@ -2858,7 +2858,7 @@ ov78_021D23B8: ; 0x021D23B8 ldr r0, [r4, #0x28] cmp r0, #0 beq _021D23C6 - bl sub_02022974 + bl GF_AssertFail _021D23C6: add r0, r4, #0 mov r1, #2 @@ -3046,7 +3046,7 @@ ov78_021D2514: ; 0x021D2514 str r3, [sp] cmp r0, #0 beq _021D2528 - bl sub_02022974 + bl GF_AssertFail _021D2528: ldr r4, [sp, #0x24] add r0, r5, #0 @@ -3087,7 +3087,7 @@ ov78_021D256C: ; 0x021D256C ldr r0, [r4, #0x54] cmp r0, #0 beq _021D257A - bl sub_02022974 + bl GF_AssertFail _021D257A: mov r0, #1 mvn r0, r0 @@ -3270,7 +3270,7 @@ ov78_021D26B4: ; 0x021D26B4 str r3, [sp] cmp r0, #0 beq _021D26C8 - bl sub_02022974 + bl GF_AssertFail _021D26C8: ldr r4, [sp, #0x28] ldr r2, [sp] @@ -3311,7 +3311,7 @@ ov78_021D270C: ; 0x021D270C ldr r0, [r4, #0x3c] cmp r0, #0 beq _021D271A - bl sub_02022974 + bl GF_AssertFail _021D271A: mov r0, #1 mvn r0, r0 @@ -3531,7 +3531,7 @@ ov78_021D28A8: ; 0x021D28A8 bl sub_0200B144 add r4, r0, #0 bne _021D28C4 - bl sub_02022974 + bl GF_AssertFail _021D28C4: add r0, r4, #0 add r1, r6, #0 @@ -3597,7 +3597,7 @@ _021D2934: ldr r0, _021D2948 ; =0x00000189 pop {r3, pc} _021D2938: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 diff --git a/asm/ov7_02249960.s b/asm/ov7_02249960.s index 5734e8efe9..513ec90033 100644 --- a/asm/ov7_02249960.s +++ b/asm/ov7_02249960.s @@ -179,7 +179,7 @@ ov7_02249AB4: ; 0x02249AB4 ldr r0, [r0, #0] cmp r0, #0 beq _02249AC4 - bl sub_02022974 + bl GF_AssertFail _02249AC4: mov r0, #4 mov r1, #0x9c @@ -1533,7 +1533,7 @@ _0224A5DA: ldrb r0, [r0] cmp r0, #0x21 blo _0224A5F6 - bl sub_02022974 + bl GF_AssertFail _0224A5F6: ldr r0, _0224A648 ; =0x0224F5A0 ldr r0, [r0, #0] diff --git a/asm/ov7_0224BE9C.s b/asm/ov7_0224BE9C.s index 550fd7013a..5885ce5a5b 100644 --- a/asm/ov7_0224BE9C.s +++ b/asm/ov7_0224BE9C.s @@ -731,7 +731,7 @@ ov7_0224C468: ; 0x0224C468 add r6, r2, #0 cmp r0, #0 beq _0224C47C - bl sub_02022974 + bl GF_AssertFail _0224C47C: ldr r0, [r5, #4] mov r1, #0xf @@ -1848,7 +1848,7 @@ ov7_0224CCF4: ; 0x0224CCF4 bl sub_0207D60C cmp r0, #1 beq _0224CD24 - bl sub_02022974 + bl GF_AssertFail _0224CD24: pop {r4, r5, r6, pc} ; .align 2, 0 diff --git a/asm/ov80_021D2AF4.s b/asm/ov80_021D2AF4.s index 1e195c27ff..3d49a7f2ab 100644 --- a/asm/ov80_021D2AF4.s +++ b/asm/ov80_021D2AF4.s @@ -357,7 +357,7 @@ ov80_021D2D70: ; 0x021D2D70 bl FS_OpenFile cmp r0, #0 bne _021D2D94 - bl sub_02022974 + bl GF_AssertFail add sp, #0x4c mov r0, #0 pop {r4, r5, r6, r7, pc} @@ -368,7 +368,7 @@ _021D2D94: bl FS_ReadFile cmp r0, #0 bge _021D2DA6 - bl sub_02022974 + bl GF_AssertFail _021D2DA6: add r0, r4, #0 mov r1, #8 diff --git a/asm/ov82_0223B140.s b/asm/ov82_0223B140.s index 446a174363..22f63ff329 100644 --- a/asm/ov82_0223B140.s +++ b/asm/ov82_0223B140.s @@ -215,7 +215,7 @@ _0223B2D4: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _0223B2D8: - bl sub_02022974 + bl GF_AssertFail _0223B2DC: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} diff --git a/asm/ov82_0223B2E0.s b/asm/ov82_0223B2E0.s index b5cd1ea3bc..3aa4e0ac8a 100644 --- a/asm/ov82_0223B2E0.s +++ b/asm/ov82_0223B2E0.s @@ -207,7 +207,7 @@ _0223B446: mov r0, #5 pop {r3, r4, r5, pc} _0223B44A: - bl sub_02022974 + bl GF_AssertFail mov r0, #0x95 str r0, [r4, #8] _0223B452: @@ -221,7 +221,7 @@ _0223B452: bl sub_0207D60C cmp r0, #0 bne _0223B46C - bl sub_02022974 + bl GF_AssertFail _0223B46C: mov r0, #4 pop {r3, r4, r5, pc} diff --git a/asm/ov83_0223B5A0.s b/asm/ov83_0223B5A0.s index 5146bed286..eec8fa0118 100644 --- a/asm/ov83_0223B5A0.s +++ b/asm/ov83_0223B5A0.s @@ -531,7 +531,7 @@ _0223B9B4: add r0, r0, #1 pop {r3, r4, r5, pc} _0223B9D2: - bl sub_02022974 + bl GF_AssertFail _0223B9D6: ldr r0, [r5, #0xc] pop {r3, r4, r5, pc} @@ -1175,7 +1175,7 @@ _0223BF20: add r0, r0, #1 pop {r4, r5, r6, r7, pc} _0223BF28: - bl sub_02022974 + bl GF_AssertFail _0223BF2C: ldr r0, [r4, #0xc] add sp, #0x14 @@ -1536,7 +1536,7 @@ _0223C1F2: add r0, r0, #1 pop {r3, r4, r5, r6, pc} _0223C21C: - bl sub_02022974 + bl GF_AssertFail _0223C220: ldr r0, [r4, #0xc] add sp, #0xc @@ -2315,7 +2315,7 @@ ov83_0223C87C: ; 0x0223C87C ldr r0, [r4, r0] cmp r0, #0 bne _0223C88E - bl sub_02022974 + bl GF_AssertFail _0223C88E: ldr r0, _0223C8AC ; =0x00001530 ldr r0, [r4, r0] diff --git a/asm/ov83_0223D4CC.s b/asm/ov83_0223D4CC.s index f81c86021d..371d76afe9 100644 --- a/asm/ov83_0223D4CC.s +++ b/asm/ov83_0223D4CC.s @@ -234,7 +234,7 @@ _0223D656: _0223D65E: cmp r4, #0 bne _0223D666 - bl sub_02022974 + bl GF_AssertFail _0223D666: mov r0, #0x1a lsl r0, r0, #4 @@ -248,11 +248,11 @@ _0223D666: blx r0 cmp r0, r5 beq _0223D682 - bl sub_02022974 + bl GF_AssertFail _0223D682: cmp r5, #0x26 blt _0223D68A - bl sub_02022974 + bl GF_AssertFail _0223D68A: sub r7, #0x16 str r7, [r4, #4] diff --git a/asm/ov83_0223D6A8.s b/asm/ov83_0223D6A8.s index 9c38901388..eb23bbf9e9 100644 --- a/asm/ov83_0223D6A8.s +++ b/asm/ov83_0223D6A8.s @@ -214,7 +214,7 @@ ov83_0223D7A8: ; 0x0223D7A8 bl sub_0200A450 cmp r0, #0 bne _0223D838 - bl sub_02022974 + bl GF_AssertFail _0223D838: ldr r0, [r4, #0] bl sub_02009D4C @@ -222,7 +222,7 @@ _0223D838: bl sub_0200A640 cmp r0, #0 bne _0223D84C - bl sub_02022974 + bl GF_AssertFail _0223D84C: ldr r0, [r4, #4] bl sub_02009D4C @@ -318,7 +318,7 @@ ov83_0223D894: ; 0x0223D894 bl sub_0200A450 cmp r0, #0 bne _0223D912 - bl sub_02022974 + bl GF_AssertFail _0223D912: ldr r0, [r4, #0] bl sub_02009D4C @@ -421,7 +421,7 @@ ov83_0223D9A8: ; 0x0223D9A8 bl sub_02021B90 add r4, r0, #0 bne _0223D9D6 - bl sub_02022974 + bl GF_AssertFail _0223D9D6: add r0, r4, #0 add sp, #0x20 @@ -623,7 +623,7 @@ ov83_0223DB30: ; 0x0223DB30 ldr r0, [r4, #0] cmp r0, #0 beq _0223DB3E - bl sub_02022974 + bl GF_AssertFail _0223DB3E: mov r2, #0x1f add r0, r4, #0 @@ -744,7 +744,7 @@ ov83_0223DC1C: ; 0x0223DC1C str r1, [sp] cmp r0, #1 beq _0223DC2C - bl sub_02022974 + bl GF_AssertFail _0223DC2C: mov r0, #0x42 lsl r0, r0, #2 @@ -785,7 +785,7 @@ ov83_0223DC68: ; 0x0223DC68 ldr r0, [r0, #4] cmp r0, #0 beq _0223DC78 - bl sub_02022974 + bl GF_AssertFail _0223DC78: mov r0, #0 str r0, [sp, #0xc] @@ -1023,7 +1023,7 @@ _0223DE36: str r1, [r4, r0] b _0223DE5C _0223DE58: - bl sub_02022974 + bl GF_AssertFail _0223DE5C: ldr r0, [sp] add r4, r4, #4 @@ -1090,7 +1090,7 @@ ov83_0223DEC4: ; 0x0223DEC4 ldr r0, [r4, #0x30] cmp r0, #0 beq _0223DED2 - bl sub_02022974 + bl GF_AssertFail _0223DED2: add r0, r4, #0 mov r1, #0 @@ -1110,7 +1110,7 @@ ov83_0223DEE0: ; 0x0223DEE0 add r7, r3, #0 cmp r0, #0 beq _0223DEF4 - bl sub_02022974 + bl GF_AssertFail _0223DEF4: add r0, r5, #0 add r1, r6, #0 @@ -1133,7 +1133,7 @@ ov83_0223DF10: ; 0x0223DF10 ldr r0, [r4, #0x30] cmp r0, #1 beq _0223DF1E - bl sub_02022974 + bl GF_AssertFail _0223DF1E: add r0, r4, #0 bl ov83_0223E138 @@ -1562,7 +1562,7 @@ ov83_0223E260: ; 0x0223E260 ldr r0, [r4, #0] cmp r0, #0 beq _0223E26E - bl sub_02022974 + bl GF_AssertFail _0223E26E: mov r0, #0 strb r0, [r4] @@ -1619,7 +1619,7 @@ ov83_0223E2C8: ; 0x0223E2C8 ldr r0, [r4, #0] cmp r0, #1 beq _0223E2D6 - bl sub_02022974 + bl GF_AssertFail _0223E2D6: ldr r0, [r4, #8] bl sub_02021BD4 @@ -1699,7 +1699,7 @@ ov83_0223E34C: ; 0x0223E34C ldr r0, [r4, #0x74] cmp r0, #0 beq _0223E35A - bl sub_02022974 + bl GF_AssertFail _0223E35A: add r0, r4, #0 mov r1, #0 @@ -1720,7 +1720,7 @@ ov83_0223E368: ; 0x0223E368 str r3, [sp, #0x10] cmp r0, #0 beq _0223E37E - bl sub_02022974 + bl GF_AssertFail _0223E37E: ldr r4, _0223E420 ; =0x02240418 ldr r5, [sp, #8] @@ -1818,7 +1818,7 @@ ov83_0223E438: ; 0x0223E438 ldr r0, [r6, #0x74] cmp r0, #1 beq _0223E446 - bl sub_02022974 + bl GF_AssertFail _0223E446: mov r4, #0 add r5, r6, #0 @@ -1861,7 +1861,7 @@ ov83_0223E484: ; 0x0223E484 add r6, r2, #0 cmp r4, #8 blo _0223E494 - bl sub_02022974 + bl GF_AssertFail _0223E494: lsl r0, r4, #2 add r0, r5, r0 @@ -1918,7 +1918,7 @@ ov83_0223E4E0: ; 0x0223E4E0 add r6, r2, #0 cmp r4, #8 blo _0223E4F0 - bl sub_02022974 + bl GF_AssertFail _0223E4F0: lsl r0, r4, #2 add r0, r5, r0 @@ -2009,7 +2009,7 @@ _0223E576: str r0, [r5, #0x6c] pop {r3, r4, r5, r6, r7, pc} _0223E592: - bl sub_02022974 + bl GF_AssertFail _0223E596: pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -2042,7 +2042,7 @@ ov83_0223E5C0: ; 0x0223E5C0 ldr r0, [r4, #0] cmp r0, #0 beq _0223E5CE - bl sub_02022974 + bl GF_AssertFail _0223E5CE: add r0, r4, #0 mov r1, #0 @@ -2219,7 +2219,7 @@ ov83_0223E6F8: ; 0x0223E6F8 ldr r0, [r4, #0x28] cmp r0, #0 beq _0223E706 - bl sub_02022974 + bl GF_AssertFail _0223E706: add r0, r4, #0 bl ov83_0223E994 @@ -2243,7 +2243,7 @@ ov83_0223E720: ; 0x0223E720 add r7, r3, #0 cmp r0, #0 beq _0223E734 - bl sub_02022974 + bl GF_AssertFail _0223E734: add r0, r5, #0 add r1, r6, #0 @@ -2272,7 +2272,7 @@ ov83_0223E760: ; 0x0223E760 ldr r0, [r4, #0x28] cmp r0, #1 beq _0223E76E - bl sub_02022974 + bl GF_AssertFail _0223E76E: add r0, r4, #0 bl ov83_0223E824 @@ -2488,7 +2488,7 @@ ov83_0223E908: ; 0x0223E908 add r5, r1, #0 cmp r0, #0 beq _0223E91A - bl sub_02022974 + bl GF_AssertFail _0223E91A: mov r2, #1 ldr r0, _0223E97C ; =ov83_0223E8DC @@ -3038,7 +3038,7 @@ ov83_0223ED4C: ; 0x0223ED4C ldr r0, [r4, #0] cmp r0, #0 beq _0223ED5A - bl sub_02022974 + bl GF_AssertFail _0223ED5A: ldr r2, _0223ED68 ; =0x00000414 add r0, r4, #0 @@ -3154,7 +3154,7 @@ _0223EE0A: str r0, [sp, #0x60] cmp r0, #0 bne _0223EE26 - bl sub_02022974 + bl GF_AssertFail _0223EE26: ldr r0, [sp, #0x60] bl ov83_0223F054 @@ -3447,7 +3447,7 @@ ov83_0223F054: ; 0x0223F054 ldr r0, [r4, #0x78] cmp r0, #0 bne _0223F062 - bl sub_02022974 + bl GF_AssertFail _0223F062: ldr r0, [r4, #0x78] bl sub_02021BD4 @@ -3682,7 +3682,7 @@ ov83_0223F1C0: ; 0x0223F1C0 str r0, [r5, #0x78] cmp r0, #0 bne _0223F238 - bl sub_02022974 + bl GF_AssertFail _0223F238: ldr r0, [r5, #0xc] cmp r0, #0 @@ -3753,7 +3753,7 @@ ov83_0223F2A8: ; 0x0223F2A8 ldr r0, [r4, #0x7c] cmp r0, #0 beq _0223F2B6 - bl sub_02022974 + bl GF_AssertFail _0223F2B6: add r0, r4, #0 mov r1, #0 @@ -3774,7 +3774,7 @@ ov83_0223F2C4: ; 0x0223F2C4 str r2, [sp, #0x18] cmp r0, #0 beq _0223F2DA - bl sub_02022974 + bl GF_AssertFail _0223F2DA: str r7, [r6, #0] mov r0, #2 @@ -3838,7 +3838,7 @@ ov83_0223F348: ; 0x0223F348 ldr r0, [r6, #0x7c] cmp r0, #1 beq _0223F356 - bl sub_02022974 + bl GF_AssertFail _0223F356: mov r4, #0 add r5, r6, #0 @@ -3891,7 +3891,7 @@ ov83_0223F3A0: ; 0x0223F3A0 add r4, r0, #0 cmp r5, #4 blt _0223F3AE - bl sub_02022974 + bl GF_AssertFail _0223F3AE: cmp r5, #2 beq _0223F3B6 @@ -3919,7 +3919,7 @@ ov83_0223F3D0: ; 0x0223F3D0 add r4, r0, #0 cmp r5, #4 blt _0223F3DE - bl sub_02022974 + bl GF_AssertFail _0223F3DE: lsl r0, r5, #4 mov r1, #0 @@ -3938,7 +3938,7 @@ ov83_0223F3F0: ; 0x0223F3F0 add r4, r0, #0 cmp r5, #4 blt _0223F3FE - bl sub_02022974 + bl GF_AssertFail _0223F3FE: lsl r0, r5, #4 add r0, r4, r0 @@ -4056,7 +4056,7 @@ ov83_0223F4AC: ; 0x0223F4AC ldr r0, [r4, #0] cmp r0, #0 beq _0223F4BA - bl sub_02022974 + bl GF_AssertFail _0223F4BA: ldr r2, _0223F4C8 ; =0x0000090C add r0, r4, #0 diff --git a/asm/ov83_0223F7F4.s b/asm/ov83_0223F7F4.s index 4143c66a2c..f703e2b2c1 100644 --- a/asm/ov83_0223F7F4.s +++ b/asm/ov83_0223F7F4.s @@ -387,7 +387,7 @@ ov83_0223FA90: ; 0x0223FA90 add r4, r0, #0 cmp r5, #3 blt _0223FA9E - bl sub_02022974 + bl GF_AssertFail _0223FA9E: str r5, [r4, #0] mov r0, #0 diff --git a/asm/ov86_0223B140.s b/asm/ov86_0223B140.s index 93db1159b7..7ad7badea1 100644 --- a/asm/ov86_0223B140.s +++ b/asm/ov86_0223B140.s @@ -4027,7 +4027,7 @@ _0223D1C6: lsl r0, r0, #0xa cmp r1, r0 blo _0223D1EC - bl sub_02022974 + bl GF_AssertFail _0223D1EC: mov r0, #1 str r0, [r7, #4] diff --git a/asm/ov88_0223B140.s b/asm/ov88_0223B140.s index f30187a4fc..039244bb0d 100644 --- a/asm/ov88_0223B140.s +++ b/asm/ov88_0223B140.s @@ -1023,7 +1023,7 @@ _0223B9DA: lsr r5, r0, #0x10 cmp r5, #0x3c blo _0223B9FA - bl sub_02022974 + bl GF_AssertFail _0223B9FA: bl sub_0203608C mov r1, #0x1f @@ -3621,7 +3621,7 @@ ov88_0223CF68: ; 0x0223CF68 add r4, r2, #0 cmp r5, #0xd blt _0223CF7A - bl sub_02022974 + bl GF_AssertFail _0223CF7A: ldr r1, _0223CFE0 ; =0x0223EF9C lsl r0, r5, #3 diff --git a/asm/ov8_02249960.s b/asm/ov8_02249960.s index 3c0420ff2c..7e09e2db8c 100644 --- a/asm/ov8_02249960.s +++ b/asm/ov8_02249960.s @@ -108,7 +108,7 @@ _02249A14: strb r0, [r5] pop {r4, r5, pc} _02249A28: - bl sub_02022974 + bl GF_AssertFail _02249A2C: add sp, #0x2c pop {r4, r5, pc} @@ -364,7 +364,7 @@ _02249C26: str r0, [r5, #0] b _02249CCC _02249C32: - bl sub_02022974 + bl GF_AssertFail b _02249CCC _02249C38: add r4, #0xa4 @@ -623,7 +623,7 @@ _02249E36: str r7, [sp, #0xc] b _02249E4E _02249E42: - bl sub_02022974 + bl GF_AssertFail mov r5, #0 mov r6, #1 add r7, r6, #0 @@ -733,7 +733,7 @@ _02249F30: mov r5, #2 b _02249F40 _02249F3C: - bl sub_02022974 + bl GF_AssertFail _02249F40: add r0, r6, #0 add r1, r7, #0 @@ -1542,7 +1542,7 @@ _0224A5A4: str r0, [r4, #0] b _0224A5D2 _0224A5CE: - bl sub_02022974 + bl GF_AssertFail _0224A5D2: ldr r0, [r6, #0x3c] ldr r1, [sp, #4] @@ -1695,7 +1695,7 @@ _0224A6FE: bl sub_02065638 b _0224A716 _0224A712: - bl sub_02022974 + bl GF_AssertFail _0224A716: ldr r0, [sp] add r1, sp, #0x10 @@ -1856,7 +1856,7 @@ _0224A84E: bl sub_02065638 b _0224A866 _0224A862: - bl sub_02022974 + bl GF_AssertFail _0224A866: ldr r0, [sp] add r1, sp, #0x10 @@ -2193,7 +2193,7 @@ ov8_0224AAFC: ; 0x0224AAFC lsr r5, r0, #0x18 cmp r5, #3 bls _0224AB1C - bl sub_02022974 + bl GF_AssertFail _0224AB1C: ldr r1, _0224AB3C ; =0x0224D035 lsl r0, r5, #0xa @@ -2204,7 +2204,7 @@ _0224AB1C: lsl r0, r0, #0xa cmp r4, r0 blt _0224AB32 - bl sub_02022974 + bl GF_AssertFail _0224AB32: ldrb r1, [r5, r4] ldr r0, [sp, #0x10] @@ -2235,7 +2235,7 @@ _0224AB58: mov r0, #0xd pop {r3, pc} _0224AB5C: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} thumb_func_end ov8_0224AB40 @@ -2260,7 +2260,7 @@ _0224AB7E: add r7, r2, #0 b _0224AB86 _0224AB82: - bl sub_02022974 + bl GF_AssertFail _0224AB86: ldrb r0, [r5, #7] mov r4, #0 @@ -2268,7 +2268,7 @@ _0224AB86: lsr r0, r0, #0x1e cmp r0, #3 bls _0224AB96 - bl sub_02022974 + bl GF_AssertFail _0224AB96: ldrb r0, [r5, #7] lsl r0, r0, #0x1e @@ -2279,7 +2279,7 @@ _0224AB96: asr r4, r0, #0x10 cmp r6, #3 bls _0224ABAC - bl sub_02022974 + bl GF_AssertFail _0224ABAC: lsl r0, r6, #0x1e asr r1, r0, #0x10 @@ -2299,7 +2299,7 @@ _0224ABC0: asr r4, r0, #0x10 b _0224ABD0 _0224ABCC: - bl sub_02022974 + bl GF_AssertFail _0224ABD0: str r4, [r7, #0] pop {r3, r4, r5, r6, r7, pc} @@ -2560,7 +2560,7 @@ _0224ADA6: asr r0, r0, #0x18 b _0224ADCA _0224ADC4: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _0224ADCA: str r0, [r6, #0] @@ -2671,7 +2671,7 @@ _0224AE92: add r6, r0, #0 b _0224AE9A _0224AE96: - bl sub_02022974 + bl GF_AssertFail _0224AE9A: ldr r0, [r6, #0] lsl r0, r0, #0x10 @@ -4017,17 +4017,17 @@ ov8_0224B8A0: ; 0x0224B8A0 push {r4, lr} add r4, r0, #0 bne _0224B8AA - bl sub_02022974 + bl GF_AssertFail _0224B8AA: ldr r0, [r4, #0x14] cmp r0, #0 bne _0224B8B4 - bl sub_02022974 + bl GF_AssertFail _0224B8B4: ldr r0, [r4, #0x10] cmp r0, #0 bne _0224B8BE - bl sub_02022974 + bl GF_AssertFail _0224B8BE: ldr r0, [r4, #0x14] bl sub_0207136C @@ -4157,7 +4157,7 @@ _0224B9BA: add r7, r7, #1 cmp r7, #0x14 ble _0224B9C4 - bl sub_02022974 + bl GF_AssertFail _0224B9C4: ldr r0, [sp] add r1, sp, #4 @@ -4178,19 +4178,19 @@ ov8_0224B9D8: ; 0x0224B9D8 add r5, r1, #0 cmp r4, #0 bge _0224B9E6 - bl sub_02022974 + bl GF_AssertFail _0224B9E6: cmp r4, #0x20 blt _0224B9EE - bl sub_02022974 + bl GF_AssertFail _0224B9EE: cmp r5, #0 bge _0224B9F6 - bl sub_02022974 + bl GF_AssertFail _0224B9F6: cmp r5, #0x20 blt _0224B9FE - bl sub_02022974 + bl GF_AssertFail _0224B9FE: lsl r0, r5, #5 add r1, r4, r0 @@ -4664,7 +4664,7 @@ _0224BD8E: str r0, [r5, #0x38] cmp r0, #0 bne _0224BDB6 - bl sub_02022974 + bl GF_AssertFail _0224BDB6: mov r0, #0 str r0, [r5, #4] @@ -4838,7 +4838,7 @@ ov8_0224BED8: ; 0x0224BED8 bl sub_02018184 add r4, r0, #0 bne _0224BEF0 - bl sub_02022974 + bl GF_AssertFail _0224BEF0: add r0, r4, #0 mov r1, #0 @@ -4986,7 +4986,7 @@ ov8_0224BFCC: ; 0x0224BFCC ldr r0, [r4, #0x24] cmp r0, #0 bne _0224C014 - bl sub_02022974 + bl GF_AssertFail _0224C014: add r0, r7, #0 bl sub_0206419C @@ -5331,7 +5331,7 @@ _0224C25C: add r0, r1, r0 cmp r2, r0 blt _0224C2C8 - bl sub_02022974 + bl GF_AssertFail _0224C2C8: mov r0, #4 ldrsh r2, [r4, r0] @@ -5340,7 +5340,7 @@ _0224C2C8: add r0, r1, r0 cmp r2, r0 blt _0224C2DA - bl sub_02022974 + bl GF_AssertFail _0224C2DA: mov r0, #6 ldrsh r2, [r4, r0] @@ -5349,7 +5349,7 @@ _0224C2DA: add r0, r1, r0 cmp r2, r0 blt _0224C2EC - bl sub_02022974 + bl GF_AssertFail _0224C2EC: mov r1, #4 mov r2, #6 @@ -5359,7 +5359,7 @@ _0224C2EC: bl sub_02054F68 cmp r0, #0 beq _0224C302 - bl sub_02022974 + bl GF_AssertFail _0224C302: mov r0, #2 ldrsh r0, [r4, r0] @@ -5591,12 +5591,12 @@ _0224C4AC: str r0, [r5, #0xc] cmp r0, #0 bne _0224C4D2 - bl sub_02022974 + bl GF_AssertFail _0224C4D2: add r7, r7, #1 cmp r7, #0x10 blt _0224C4DC - bl sub_02022974 + bl GF_AssertFail _0224C4DC: add r5, #0x1c _0224C4DE: @@ -5818,7 +5818,7 @@ _0224C67E: _0224C68C: cmp r4, #2 bne _0224C694 - bl sub_02022974 + bl GF_AssertFail _0224C694: ldr r0, _0224C6D4 ; =0x0224C708 lsl r1, r4, #2 diff --git a/asm/ov90_021D0D80.s b/asm/ov90_021D0D80.s index c08d0b0ba8..76f5412a2d 100644 --- a/asm/ov90_021D0D80.s +++ b/asm/ov90_021D0D80.s @@ -558,7 +558,7 @@ _021D11C8: bl ov90_021D1A48 b _021D11DC _021D11D0: - bl sub_02022974 + bl GF_AssertFail b _021D11DC _021D11D6: add r0, r5, #0 diff --git a/asm/ov94_022414B8.s b/asm/ov94_022414B8.s index 14688f5cc8..93eed39d2a 100644 --- a/asm/ov94_022414B8.s +++ b/asm/ov94_022414B8.s @@ -2546,13 +2546,13 @@ ov94_02242934: ; 0x02242934 ldr r6, _02242968 ; =0x0224610C cmp r4, #0xc blt _02242954 - bl sub_02022974 + bl GF_AssertFail b _02242954 _0224294A: ldr r6, _0224296C ; =0x022460AC cmp r4, #0xb blo _02242954 - bl sub_02022974 + bl GF_AssertFail _02242954: lsl r0, r4, #3 add r1, r6, r0 diff --git a/asm/ov94_02242AD0.s b/asm/ov94_02242AD0.s index 258ec847b7..df29978e5f 100644 --- a/asm/ov94_02242AD0.s +++ b/asm/ov94_02242AD0.s @@ -466,7 +466,7 @@ _02242E66: str r0, [r4, #0x2c] b _02242E84 _02242E80: - bl sub_02022974 + bl GF_AssertFail _02242E84: add r0, r4, #0 bl ov94_0223C5D8 @@ -1968,7 +1968,7 @@ ov94_02243990: ; 0x02243990 lsr r5, r0, #0x10 cmp r5, #0x3c blo _022439BC - bl sub_02022974 + bl GF_AssertFail _022439BC: mov r0, #0x42 add r1, r5, #2 diff --git a/asm/ov94_022444C8.s b/asm/ov94_022444C8.s index af7988bd9b..a1f6188107 100644 --- a/asm/ov94_022444C8.s +++ b/asm/ov94_022444C8.s @@ -519,7 +519,7 @@ _022448D2: add r0, r0, r1 pop {r3, pc} _022448DE: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 diff --git a/asm/ov94_02244950.s b/asm/ov94_02244950.s index 490bef80f6..a9af5be1d6 100644 --- a/asm/ov94_02244950.s +++ b/asm/ov94_02244950.s @@ -437,7 +437,7 @@ _02244CEE: ldr r0, [sp, #0x24] cmp r0, #0x15 blt _02244CF8 - bl sub_02022974 + bl GF_AssertFail _02244CF8: ldr r0, [sp, #0x30] mov r7, #1 diff --git a/asm/ov95_02246C20.s b/asm/ov95_02246C20.s index 67e0c99a6c..22d7819fa6 100644 --- a/asm/ov95_02246C20.s +++ b/asm/ov95_02246C20.s @@ -1435,7 +1435,7 @@ ov95_022476C8: ; 0x022476C8 ldr r0, [r0, #0] cmp r0, #0x20 blt _022476D8 - bl sub_02022974 + bl GF_AssertFail _022476D8: ldr r0, _022476E8 ; =0x0224C2E0 ldr r2, [r0, #0] diff --git a/asm/ov96_0223BCE0.s b/asm/ov96_0223BCE0.s index 4107e1436d..96e82f3fdf 100644 --- a/asm/ov96_0223BCE0.s +++ b/asm/ov96_0223BCE0.s @@ -455,7 +455,7 @@ _0223C0A4: ldr r0, [sp, #0x24] cmp r0, #0x15 blt _0223C0AE - bl sub_02022974 + bl GF_AssertFail _0223C0AE: ldr r0, [sp, #0x30] mov r7, #1 diff --git a/asm/ov97_02230410.s b/asm/ov97_02230410.s index 829bd9aa8c..13b4f88709 100644 --- a/asm/ov97_02230410.s +++ b/asm/ov97_02230410.s @@ -2095,7 +2095,7 @@ ov97_02231488: ; 0x02231488 ldr r0, [r4, r0] cmp r0, #3 blt _0223149A - bl sub_02022974 + bl GF_AssertFail _0223149A: mov r0, #0x1f bl sub_02025C48 diff --git a/asm/ov97_02237694.s b/asm/ov97_02237694.s index e1404c5195..a825b0b36d 100644 --- a/asm/ov97_02237694.s +++ b/asm/ov97_02237694.s @@ -609,7 +609,7 @@ ov97_02237AEC: ; 0x02237AEC ldr r0, [r0, #0x34] cmp r0, #0 bne _02237AFC - bl sub_02022974 + bl GF_AssertFail _02237AFC: add r4, #0x34 add r0, r4, #0 diff --git a/asm/ov98_02246C20.s b/asm/ov98_02246C20.s index bca95fb3f4..dff1bb6698 100644 --- a/asm/ov98_02246C20.s +++ b/asm/ov98_02246C20.s @@ -656,7 +656,7 @@ ov98_022470B8: ; 0x022470B8 ldr r0, [sp] cmp r0, #0 bne _022470E0 - bl sub_02022974 + bl GF_AssertFail _022470E0: add r0, r4, #0 bl sub_02089438 @@ -716,7 +716,7 @@ ov98_02247134: ; 0x02247134 ldr r0, [sp] cmp r0, #0 bne _02247154 - bl sub_02022974 + bl GF_AssertFail _02247154: add r0, r4, #0 bl sub_02089438 diff --git a/asm/ov98_022471C8.s b/asm/ov98_022471C8.s index da9b792399..c85b219673 100644 --- a/asm/ov98_022471C8.s +++ b/asm/ov98_022471C8.s @@ -759,7 +759,7 @@ _0224787C: ldr r0, [sp, #0x24] cmp r0, #0x15 blt _02247886 - bl sub_02022974 + bl GF_AssertFail _02247886: ldr r0, [sp, #0x34] mov r7, #1 @@ -3884,7 +3884,7 @@ _022490C4: str r0, [r4, #8] b _02249150 _022490CE: - bl sub_02022974 + bl GF_AssertFail bl sub_02038A0C b _02249150 _022490D8: diff --git a/asm/ov98_022499C8.s b/asm/ov98_022499C8.s index 3e9b113e6a..cbf8a49fa7 100644 --- a/asm/ov98_022499C8.s +++ b/asm/ov98_022499C8.s @@ -71,7 +71,7 @@ _02249A32: _02249A3A: cmp r0, #0xa blo _02249A42 - bl sub_02022974 + bl GF_AssertFail _02249A42: add r4, r4, #1 add r7, r7, #2 @@ -161,7 +161,7 @@ _02249AE0: cmp r0, #0 bne _02249AEC bne _02249AFA - bl sub_02022974 + bl GF_AssertFail b _02249AFA _02249AEC: add r4, r4, #1 diff --git a/asm/ov99_021D0D80.s b/asm/ov99_021D0D80.s index f99858c532..d469ef96b7 100644 --- a/asm/ov99_021D0D80.s +++ b/asm/ov99_021D0D80.s @@ -560,7 +560,7 @@ ov99_021D1270: ; 0x021D1270 ldr r0, [r4, r0] cmp r0, #0 bne _021D1280 - bl sub_02022974 + bl GF_AssertFail _021D1280: ldr r0, _021D12EC ; =0x0000110C ldr r0, [r4, r0] @@ -633,7 +633,7 @@ ov99_021D1314: ; 0x021D1314 ldr r0, [r4, r0] cmp r0, #0 beq _021D1324 - bl sub_02022974 + bl GF_AssertFail _021D1324: ldr r0, [r4, #8] mov r1, #1 diff --git a/asm/ov99_021D1A54.s b/asm/ov99_021D1A54.s index ed7f15599b..7af70db911 100644 --- a/asm/ov99_021D1A54.s +++ b/asm/ov99_021D1A54.s @@ -234,7 +234,7 @@ _021D1BD4: ldr r0, [r5, r0] cmp r0, #0 beq _021D1C38 - bl sub_02022974 + bl GF_AssertFail _021D1C38: ldr r0, [r5, #0] ldr r0, [r0, #0] diff --git a/asm/ov99_021D340C.s b/asm/ov99_021D340C.s index 844fd16a77..6fef0a0c7c 100644 --- a/asm/ov99_021D340C.s +++ b/asm/ov99_021D340C.s @@ -422,11 +422,11 @@ ov99_021D372C: ; 0x021D372C add r6, r2, #0 cmp r0, #0 beq _021D3744 - bl sub_02022974 + bl GF_AssertFail _021D3744: cmp r6, #3 blo _021D374C - bl sub_02022974 + bl GF_AssertFail _021D374C: mov r0, #0x47 mov r1, #1 diff --git a/asm/ov99_021D4134.s b/asm/ov99_021D4134.s index 3455c1a298..124fddb131 100644 --- a/asm/ov99_021D4134.s +++ b/asm/ov99_021D4134.s @@ -62,7 +62,7 @@ _021D4190: ldrsh r0, [r5, r0] cmp r0, #0x10 ble _021D419C - bl sub_02022974 + bl GF_AssertFail _021D419C: mov r4, #0 ldrsh r0, [r5, r4] @@ -336,7 +336,7 @@ ov99_021D439C: ; 0x021D439C _021D43B4: cmp r6, #0xa blo _021D43BC - bl sub_02022974 + bl GF_AssertFail _021D43BC: ldr r0, [r5, #0] ldr r0, [r0, #0] @@ -354,7 +354,7 @@ _021D43CC: _021D43D4: cmp r6, #0xa blo _021D43DC - bl sub_02022974 + bl GF_AssertFail _021D43DC: ldr r0, [r5, #0] ldr r0, [r0, #0] diff --git a/asm/ov9_02249960.s b/asm/ov9_02249960.s index 27bd1bc914..a086d8faf1 100644 --- a/asm/ov9_02249960.s +++ b/asm/ov9_02249960.s @@ -489,7 +489,7 @@ ov9_02249D70: ; 0x02249D70 ldr r4, [r0, #4] cmp r5, #0xb blo _02249D7E - bl sub_02022974 + bl GF_AssertFail _02249D7E: mov r0, #1 ldrh r1, [r4, #0xa] @@ -507,7 +507,7 @@ ov9_02249D8C: ; 0x02249D8C ldr r4, [r0, #4] cmp r5, #0xb blo _02249D9A - bl sub_02022974 + bl GF_AssertFail _02249D9A: mov r0, #1 lsl r0, r5 @@ -525,7 +525,7 @@ ov9_02249DA8: ; 0x02249DA8 ldr r5, [r0, #4] cmp r4, #0xb blo _02249DB6 - bl sub_02022974 + bl GF_AssertFail _02249DB6: mov r0, #1 add r1, r0, #0 @@ -546,7 +546,7 @@ ov9_02249DC8: ; 0x02249DC8 ldr r4, [r0, #4] cmp r5, #0x11 blo _02249DD6 - bl sub_02022974 + bl GF_AssertFail _02249DD6: mov r0, #1 ldr r1, [r4, #0xc] @@ -564,7 +564,7 @@ ov9_02249DE4: ; 0x02249DE4 ldr r4, [r0, #4] cmp r5, #0x11 blo _02249DF2 - bl sub_02022974 + bl GF_AssertFail _02249DF2: mov r0, #1 lsl r0, r5 @@ -582,7 +582,7 @@ ov9_02249E00: ; 0x02249E00 ldr r5, [r0, #4] cmp r4, #0x11 blo _02249E0E - bl sub_02022974 + bl GF_AssertFail _02249E0E: mov r0, #1 add r1, r0, #0 @@ -603,7 +603,7 @@ ov9_02249E20: ; 0x02249E20 ldr r4, [r0, #4] cmp r5, #0x10 blo _02249E2E - bl sub_02022974 + bl GF_AssertFail _02249E2E: ldr r1, [r4, #0] ldr r0, _02249E40 ; =0xE1FFFFFF @@ -727,7 +727,7 @@ ov9_02249EF0: ; 0x02249EF0 ldr r0, [r4, r0] cmp r0, #0 beq _02249F00 - bl sub_02022974 + bl GF_AssertFail _02249F00: ldr r0, _02249F14 ; =ov9_02249F3C add r1, r4, #0 @@ -749,7 +749,7 @@ ov9_02249F18: ; 0x02249F18 ldr r0, [r4, r0] cmp r0, #0 bne _02249F28 - bl sub_02022974 + bl GF_AssertFail _02249F28: ldr r0, _02249F38 ; =0x00001E70 ldr r0, [r4, r0] @@ -858,7 +858,7 @@ ov9_02249FD0: ; 0x02249FD0 push {r4, lr} add r4, r0, #0 bne _02249FDA - bl sub_02022974 + bl GF_AssertFail _02249FDA: add r0, r4, #0 bl sub_0203D174 @@ -1172,7 +1172,7 @@ ov9_0224A228: ; 0x0224A228 ldr r0, [r5, #0x10] cmp r0, #0 beq _0224A254 - bl sub_02022974 + bl GF_AssertFail _0224A254: str r4, [r5, #0x1c] add r0, r6, #0 @@ -1377,7 +1377,7 @@ _0224A3B4: cmp r3, r5 blt _0224A3A2 _0224A3BC: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} ; .align 2, 0 thumb_func_end ov9_0224A390 @@ -1415,7 +1415,7 @@ _0224A3F8: cmp r1, r0 blt _0224A3D8 _0224A400: - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} ; .align 2, 0 thumb_func_end ov9_0224A3C4 @@ -1444,7 +1444,7 @@ _0224A428: cmp r3, r5 blt _0224A41A _0224A430: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} ; .align 2, 0 thumb_func_end ov9_0224A408 @@ -1577,7 +1577,7 @@ _0224A510: cmp r1, r3 blt _0224A4EA _0224A518: - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} ; .align 2, 0 thumb_func_end ov9_0224A4D0 @@ -1656,7 +1656,7 @@ ov9_0224A578: ; 0x0224A578 add r5, r0, #0 cmp r4, #0x80 ble _0224A586 - bl sub_02022974 + bl GF_AssertFail _0224A586: add r5, #0x58 add r0, r5, #0 @@ -2164,7 +2164,7 @@ _0224A974: mov r7, #2 b _0224A97E _0224A97A: - bl sub_02022974 + bl GF_AssertFail _0224A97E: ldr r0, [sp, #0x10] add r1, r7, #0 @@ -2178,7 +2178,7 @@ _0224A97E: bl sub_02062E44 cmp r0, #1 beq _0224A9A0 - bl sub_02022974 + bl GF_AssertFail _0224A9A0: cmp r7, #2 bne _0224A9C6 @@ -2667,7 +2667,7 @@ _0224AD64: add r7, #8 b _0224AD6E _0224AD6A: - bl sub_02022974 + bl GF_AssertFail _0224AD6E: ldr r0, [sp] lsl r1, r0, #2 @@ -3189,7 +3189,7 @@ ov9_0224B130: ; 0x0224B130 bl sub_02021B90 add r4, r0, #0 bne _0224B1AC - bl sub_02022974 + bl GF_AssertFail _0224B1AC: add r0, r4, #0 add sp, #0x70 @@ -3506,7 +3506,7 @@ ov9_0224B3F8: ; 0x0224B3F8 add r7, r3, #0 cmp r0, #0 beq _0224B40C - bl sub_02022974 + bl GF_AssertFail _0224B40C: mov r0, #0 strb r0, [r4] @@ -3527,7 +3527,7 @@ _0224B40C: str r0, [r4, #4] cmp r0, #0 bne _0224B436 - bl sub_02022974 + bl GF_AssertFail _0224B436: ldr r0, [r4, #4] lsl r5, r0, #2 @@ -3746,13 +3746,13 @@ ov9_0224B5B0: ; 0x0224B5B0 ldr r0, [r4, r0] cmp r0, #0 beq _0224B5C0 - bl sub_02022974 + bl GF_AssertFail _0224B5C0: ldr r0, _0224B5E4 ; =0x000016C8 ldr r0, [r4, r0] cmp r0, #0 beq _0224B5CC - bl sub_02022974 + bl GF_AssertFail _0224B5CC: ldr r0, _0224B5E8 ; =0x000016B8 add r3, r4, r0 @@ -3778,13 +3778,13 @@ ov9_0224B5EC: ; 0x0224B5EC ldr r0, [r4, r0] cmp r0, #0 beq _0224B5FE - bl sub_02022974 + bl GF_AssertFail _0224B5FE: ldr r0, _0224B61C ; =0x000016BC ldr r0, [r4, r0] cmp r0, #0 beq _0224B60A - bl sub_02022974 + bl GF_AssertFail _0224B60A: ldr r0, _0224B620 ; =0x000016C4 add r3, r4, r0 @@ -3808,7 +3808,7 @@ ov9_0224B624: ; 0x0224B624 ldr r6, _0224B648 ; =0x000016B8 cmp r4, #0x18 blo _0224B634 - bl sub_02022974 + bl GF_AssertFail _0224B634: mov r0, #1 ldr r1, [r5, r6] @@ -3833,7 +3833,7 @@ ov9_0224B64C: ; 0x0224B64C ldr r6, _0224B670 ; =0x000016B8 cmp r1, #0x18 blo _0224B660 - bl sub_02022974 + bl GF_AssertFail _0224B660: ldr r0, [r5, r6] and r0, r4 @@ -3854,7 +3854,7 @@ ov9_0224B674: ; 0x0224B674 ldr r6, _0224B694 ; =0x000016B8 cmp r4, #0x18 blo _0224B684 - bl sub_02022974 + bl GF_AssertFail _0224B684: mov r0, #1 add r1, r0, #0 @@ -3877,7 +3877,7 @@ ov9_0224B698: ; 0x0224B698 ldr r6, _0224B6B8 ; =0x000016C4 cmp r4, #0x18 blo _0224B6A8 - bl sub_02022974 + bl GF_AssertFail _0224B6A8: mov r0, #1 add r1, r0, #0 @@ -4035,7 +4035,7 @@ ov9_0224B7B0: ; 0x0224B7B0 add r4, r0, r1 cmp r7, #0x19 bne _0224B7C2 - bl sub_02022974 + bl GF_AssertFail _0224B7C2: ldr r0, [r4, #4] mov r6, #0 @@ -4113,7 +4113,7 @@ ov9_0224B844: ; 0x0224B844 add r4, r0, r1 cmp r7, #5 bne _0224B856 - bl sub_02022974 + bl GF_AssertFail _0224B856: ldr r0, [r4, #4] mov r6, #0 @@ -5062,7 +5062,7 @@ ov9_0224BFBC: ; 0x0224BFBC ldr r0, [r4, r0] cmp r0, #0 beq _0224BFCE - bl sub_02022974 + bl GF_AssertFail _0224BFCE: ldr r1, _0224BFDC ; =0x00001638 ldr r0, [r4, #8] @@ -5080,7 +5080,7 @@ ov9_0224BFE0: ; 0x0224BFE0 ldr r0, [r4, #8] cmp r0, #0 bne _0224BFEE - bl sub_02022974 + bl GF_AssertFail _0224BFEE: ldr r0, [r4, #8] bl sub_020181C4 @@ -5121,7 +5121,7 @@ _0224C022: cmp r2, r4 blt _0224C018 _0224C02A: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} ; .align 2, 0 @@ -5190,7 +5190,7 @@ ov9_0224C088: ; 0x0224C088 add r6, r2, #0 cmp r0, #0 beq _0224C09A - bl sub_02022974 + bl GF_AssertFail _0224C09A: add r2, r4, #0 mov r1, #0x1c @@ -5348,13 +5348,13 @@ ov9_0224C194: ; 0x0224C194 ldr r0, _0224C1D8 ; =0x00000251 cmp r1, r0 beq _0224C1A6 - bl sub_02022974 + bl GF_AssertFail _0224C1A6: ldr r0, _0224C1DC ; =0x000016A8 ldr r0, [r4, r0] cmp r0, #0 beq _0224C1B2 - bl sub_02022974 + bl GF_AssertFail _0224C1B2: ldr r2, _0224C1E0 ; =0x00001644 add r0, r2, #0 @@ -5388,13 +5388,13 @@ ov9_0224C1E4: ; 0x0224C1E4 ldr r0, _0224C228 ; =0x00000251 cmp r1, r0 beq _0224C1F6 - bl sub_02022974 + bl GF_AssertFail _0224C1F6: ldr r0, _0224C22C ; =0x0000165C ldr r0, [r4, r0] cmp r0, #0 beq _0224C202 - bl sub_02022974 + bl GF_AssertFail _0224C202: ldr r2, _0224C230 ; =0x00001690 add r0, r2, #0 @@ -5556,7 +5556,7 @@ ov9_0224C2C4: ; 0x0224C2C4 ldr r0, [r5, r0] cmp r0, #0 beq _0224C2D8 - bl sub_02022974 + bl GF_AssertFail _0224C2D8: add r0, r5, r6 bl ov9_0224C234 @@ -5906,7 +5906,7 @@ ov9_0224C52C: ; 0x0224C52C ldr r0, [r4, #0x10] cmp r0, #0 bne _0224C54A - bl sub_02022974 + bl GF_AssertFail _0224C54A: ldrh r0, [r5, #0x10] ldr r1, [r4, #0x10] @@ -5962,7 +5962,7 @@ _0224C5A4: ldr r0, [r6, #0x10] cmp r0, #0 bne _0224C5AE - bl sub_02022974 + bl GF_AssertFail _0224C5AE: mov r0, #0 ldrsh r0, [r4, r0] @@ -6028,7 +6028,7 @@ _0224C60A: str r0, [sp, #8] b _0224C626 _0224C622: - bl sub_02022974 + bl GF_AssertFail _0224C626: ldr r0, [sp] ldr r1, [sp, #0xc] @@ -6052,7 +6052,7 @@ ov9_0224C640: ; 0x0224C640 ldr r0, [r5, r0] cmp r0, #0 beq _0224C654 - bl sub_02022974 + bl GF_AssertFail _0224C654: add r0, r5, r6 bl ov9_0224C24C @@ -6144,7 +6144,7 @@ ov9_0224C6E4: ; 0x0224C6E4 ldr r0, [r5, r0] cmp r0, #0 beq _0224C6F8 - bl sub_02022974 + bl GF_AssertFail _0224C6F8: add r0, r5, r6 bl ov9_0224C264 @@ -6233,17 +6233,17 @@ ov9_0224C788: ; 0x0224C788 ldr r0, [r4, #0] cmp r0, #0 beq _0224C798 - bl sub_02022974 + bl GF_AssertFail _0224C798: ldr r0, [r4, #4] cmp r0, #0 beq _0224C7A2 - bl sub_02022974 + bl GF_AssertFail _0224C7A2: ldr r0, [r4, #8] cmp r0, #0 beq _0224C7AC - bl sub_02022974 + bl GF_AssertFail _0224C7AC: add r0, r5, #0 bl ov9_0224C2A8 @@ -6902,11 +6902,11 @@ ov9_0224CC50: ; 0x0224CC50 ldr r0, [r4, #0] cmp r0, #0 beq _0224CC64 - bl sub_02022974 + bl GF_AssertFail _0224CC64: cmp r5, #0 bne _0224CC6C - bl sub_02022974 + bl GF_AssertFail _0224CC6C: str r5, [r4, #0] mov r0, #0 @@ -6970,7 +6970,7 @@ ov9_0224CCB8: ; 0x0224CCB8 ldr r0, _0224CD80 ; =0x00000251 cmp r1, r0 bne _0224CCDC - bl sub_02022974 + bl GF_AssertFail _0224CCDC: ldr r0, [sp, #8] ldr r0, [r0, #8] @@ -7217,7 +7217,7 @@ ov9_0224CEBC: ; 0x0224CEBC ldr r0, _0224CFDC ; =0x00000251 cmp r1, r0 bne _0224CEE0 - bl sub_02022974 + bl GF_AssertFail _0224CEE0: ldr r0, [sp, #4] ldr r0, [r0, #4] @@ -7496,7 +7496,7 @@ ov9_0224D0C8: ; 0x0224D0C8 str r0, [r5, #0x68] cmp r0, #0 bne _0224D184 - bl sub_02022974 + bl GF_AssertFail b _0224D184 _0224D11C: mov r1, #0x91 @@ -7512,7 +7512,7 @@ _0224D11C: str r0, [r5, #0x68] cmp r0, #0 bne _0224D184 - bl sub_02022974 + bl GF_AssertFail b _0224D184 _0224D13E: ldr r0, [r0, #4] @@ -7948,7 +7948,7 @@ _0224D4A4: bl ov9_0224CC50 b _0224D4B8 _0224D4B4: - bl sub_02022974 + bl GF_AssertFail _0224D4B8: mov r0, #4 strh r0, [r4, #4] @@ -8196,7 +8196,7 @@ ov9_0224D69C: ; 0x0224D69C bl sub_0206251C add r4, r0, #0 bne _0224D6B2 - bl sub_02022974 + bl GF_AssertFail _0224D6B2: add r0, r4, #0 bl sub_02063020 @@ -8204,7 +8204,7 @@ _0224D6B2: sub r0, #0x58 cmp r0, #3 blo _0224D6C4 - bl sub_02022974 + bl GF_AssertFail _0224D6C4: sub r6, #0x58 ldr r1, _0224D6DC ; =0x02251384 @@ -8268,7 +8268,7 @@ _0224D730: add r3, #0xc cmp r2, #0xa blt _0224D726 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -8320,7 +8320,7 @@ ov9_0224D780: ; 0x0224D780 add r6, r5, r0 cmp r4, #0x19 blo _0224D796 - bl sub_02022974 + bl GF_AssertFail _0224D796: mov r0, #0x18 mul r0, r4 @@ -8354,7 +8354,7 @@ ov9_0224D7C0: ; 0x0224D7C0 add r4, r0, r1 cmp r5, #0x19 blo _0224D7D2 - bl sub_02022974 + bl GF_AssertFail _0224D7D2: mov r0, #0x18 mul r0, r5 @@ -8380,7 +8380,7 @@ ov9_0224D7EC: ; 0x0224D7EC add r4, r0, r1 cmp r5, #0x19 blo _0224D7FE - bl sub_02022974 + bl GF_AssertFail _0224D7FE: mov r0, #0x18 mul r0, r5 @@ -8388,7 +8388,7 @@ _0224D7FE: ldr r0, [r4, r0] cmp r0, #0x19 bne _0224D80E - bl sub_02022974 + bl GF_AssertFail _0224D80E: add r0, r5, #4 pop {r3, r4, r5, pc} @@ -8406,7 +8406,7 @@ ov9_0224D814: ; 0x0224D814 add r7, r6, r0 cmp r5, #5 blo _0224D82A - bl sub_02022974 + bl GF_AssertFail _0224D82A: mov r0, #0x96 lsl r0, r0, #2 @@ -8454,7 +8454,7 @@ ov9_0224D874: ; 0x0224D874 add r4, r0, r1 cmp r5, #5 blo _0224D886 - bl sub_02022974 + bl GF_AssertFail _0224D886: mov r0, #0x96 lsl r0, r0, #2 @@ -8538,7 +8538,7 @@ _0224D912: add r3, #0x7c cmp r1, #0x22 blt _0224D8F0 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} nop @@ -8550,7 +8550,7 @@ ov9_0224D928: ; 0x0224D928 push {r4, lr} add r4, r1, #0 bne _0224D932 - bl sub_02022974 + bl GF_AssertFail _0224D932: mov r0, #0 strh r0, [r4] @@ -8784,7 +8784,7 @@ ov9_0224DAB8: ; 0x0224DAB8 ldr r0, [r4, r5] cmp r0, #0x19 blo _0224DAD8 - bl sub_02022974 + bl GF_AssertFail _0224DAD8: add r0, r4, r5 mov r1, #0x3f @@ -9121,7 +9121,7 @@ ov9_0224DD40: ; 0x0224DD40 add r7, r2, #0 cmp r5, #0 bne _0224DD50 - bl sub_02022974 + bl GF_AssertFail _0224DD50: ldr r0, [r5, #4] ldr r0, [r0, #0] @@ -9216,7 +9216,7 @@ _0224DDF4: add r3, #0x24 cmp r2, #0x20 blt _0224DDE6 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -9305,7 +9305,7 @@ _0224DE80: add r3, #0x20 cmp r2, #0x16 blo _0224DE76 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -9611,7 +9611,7 @@ ov9_0224E0E0: ; 0x0224E0E0 add r4, r0, r1 cmp r5, #0x19 bne _0224E0F0 - bl sub_02022974 + bl GF_AssertFail _0224E0F0: ldr r2, _0224E11C ; =0x022531D0 mov r0, #0 @@ -9647,7 +9647,7 @@ ov9_0224E120: ; 0x0224E120 add r4, r0, r1 cmp r5, #5 bne _0224E130 - bl sub_02022974 + bl GF_AssertFail _0224E130: ldr r2, _0224E15C ; =0x022531D0 mov r0, #0 @@ -9963,11 +9963,11 @@ ov9_0224E350: ; 0x0224E350 add r4, #0xd8 cmp r0, #0 beq _0224E364 - bl sub_02022974 + bl GF_AssertFail _0224E364: cmp r5, #0 bne _0224E36C - bl sub_02022974 + bl GF_AssertFail _0224E36C: mov r0, #1 str r0, [r4, #0] @@ -9986,7 +9986,7 @@ ov9_0224E37C: ; 0x0224E37C add r5, r0, #0 cmp r4, #0xa0 blo _0224E38A - bl sub_02022974 + bl GF_AssertFail _0224E38A: add r5, #0xe4 add r0, r5, #0 @@ -10015,7 +10015,7 @@ ov9_0224E3A0: ; 0x0224E3A0 str r1, [sp, #4] cmp r5, #0 bne _0224E3B6 - bl sub_02022974 + bl GF_AssertFail _0224E3B6: ldrh r0, [r4, #4] lsl r1, r0, #3 @@ -10207,7 +10207,7 @@ ov9_0224E4E8: ; 0x0224E4E8 bl sub_0206251C add r4, r0, #0 bne _0224E506 - bl sub_02022974 + bl GF_AssertFail _0224E506: add r0, r4, #0 bl sub_020655F4 @@ -10235,7 +10235,7 @@ ov9_0224E520: ; 0x0224E520 bl sub_0206251C add r4, r0, #0 bne _0224E53C - bl sub_02022974 + bl GF_AssertFail _0224E53C: add r0, r4, #0 bl sub_020656AC @@ -10268,7 +10268,7 @@ ov9_0224E550: ; 0x0224E550 str r0, [r4, #0x24] cmp r0, #0 bne _0224E57C - bl sub_02022974 + bl GF_AssertFail _0224E57C: mov r0, #6 ldrsh r0, [r5, r0] @@ -10663,7 +10663,7 @@ ov9_0224E884: ; 0x0224E884 add r5, r0, #0 cmp r4, #1 blo _0224E892 - bl sub_02022974 + bl GF_AssertFail _0224E892: ldr r0, [r5, #4] mov r1, #0x24 @@ -10789,7 +10789,7 @@ ov9_0224E964: ; 0x0224E964 ldr r0, [r4, #8] cmp r0, #0 bne _0224E974 - bl sub_02022974 + bl GF_AssertFail _0224E974: ldr r0, [r4, #8] bl sub_02071598 @@ -10830,7 +10830,7 @@ ov9_0224E9A4: ; 0x0224E9A4 ldr r6, _0224E9C8 ; =0x00001E50 cmp r4, #0x19 bne _0224E9B4 - bl sub_02022974 + bl GF_AssertFail _0224E9B4: ldr r0, [r5, r6] cmp r0, #1 @@ -10854,7 +10854,7 @@ ov9_0224E9CC: ; 0x0224E9CC ldr r6, _0224E9F0 ; =0x00001E50 cmp r4, #5 bne _0224E9DC - bl sub_02022974 + bl GF_AssertFail _0224E9DC: ldr r0, [r5, r6] cmp r0, #1 @@ -11239,7 +11239,7 @@ _0224EC78: add r0, #0x18 cmp r2, #8 blt _0224EC78 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 _0224EC8C: pop {r3, pc} @@ -11537,7 +11537,7 @@ _0224EE8C: add r4, r4, #4 cmp r2, #0x13 blt _0224EE78 - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} nop _0224EE9C: .word 0x00001C10 @@ -11562,7 +11562,7 @@ _0224EEB6: add r3, r3, #4 cmp r1, #0x13 blt _0224EEAA - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} nop @@ -11602,7 +11602,7 @@ _0224EEEE: ldrh r1, [r5, #2] cmp r1, r0 beq _0224EF14 - bl sub_02022974 + bl GF_AssertFail _0224EF14: ldr r0, [sp] add sp, #8 @@ -11703,7 +11703,7 @@ _0224EFB6: str r0, [r5, #0] cmp r0, #0 bne _0224EFCE - bl sub_02022974 + bl GF_AssertFail _0224EFCE: ldr r0, [r5, #0] mov r1, #1 @@ -11892,14 +11892,14 @@ _0224F12A: cmp r0, #0 bne _0224F0EE _0224F132: - bl sub_02022974 + bl GF_AssertFail _0224F136: add r6, #8 ldr r1, [r6, #0] ldr r0, _0224F154 ; =0x00000251 cmp r1, r0 bne _0224F0E2 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -11967,7 +11967,7 @@ _0224F1B4: cmp r0, #1 beq _0224F194 _0224F1C4: - bl sub_02022974 + bl GF_AssertFail add sp, #0xc pop {r4, r5, r6, r7, pc} thumb_func_end ov9_0224F16C @@ -11981,7 +11981,7 @@ ov9_0224F1CC: ; 0x0224F1CC add r5, r0, r1 cmp r6, #0 bne _0224F1DE - bl sub_02022974 + bl GF_AssertFail _0224F1DE: ldr r0, [r5, #0] cmp r0, r6 @@ -12341,7 +12341,7 @@ _0224F484: mov r6, #5 b _0224F48E _0224F48A: - bl sub_02022974 + bl GF_AssertFail _0224F48E: ldr r0, [r4, #0] add r1, r6, #0 @@ -12448,7 +12448,7 @@ _0224F56C: mov r5, #6 b _0224F576 _0224F572: - bl sub_02022974 + bl GF_AssertFail _0224F576: ldr r0, [r4, #0] add r1, r6, #0 @@ -12617,7 +12617,7 @@ _0224F6BE: mov r4, #5 b _0224F6C8 _0224F6C4: - bl sub_02022974 + bl GF_AssertFail _0224F6C8: ldr r0, [r5, #0] add r1, r6, #0 @@ -13659,7 +13659,7 @@ _0224FEBE: ldr r0, [sp, #0xc] cmp r0, #3 bne _0224FEC8 - bl sub_02022974 + bl GF_AssertFail _0224FEC8: mov r0, #0 add sp, #0x1c @@ -14314,7 +14314,7 @@ _02250416: _02250454: cmp r7, #3 bne _0225045C - bl sub_02022974 + bl GF_AssertFail _0225045C: mov r0, #0 add sp, #0xc @@ -15903,7 +15903,7 @@ ov9_02251000: ; 0x02251000 add sp, #8 pop {r3, r4, r5, r6, r7, pc} _0225103C: - bl sub_02022974 + bl GF_AssertFail add sp, #8 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov9_02251000 @@ -15921,7 +15921,7 @@ ov9_02251044: ; 0x02251044 bl sub_02027F80 cmp r0, #9 beq _02251068 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _02251068: diff --git a/asm/unk_02000C88.s b/asm/unk_02000C88.s index b75a4e4b51..ffcd441053 100644 --- a/asm/unk_02000C88.s +++ b/asm/unk_02000C88.s @@ -93,7 +93,7 @@ _02000D3A: bl sub_02000EC4 b _02000D5E _02000D5A: - bl sub_02022974 + bl GF_AssertFail _02000D5E: ldr r0, _02000E34 ; =0x021BF67C mov r1, #1 @@ -262,7 +262,7 @@ sub_02000EC4: ; 0x02000EC4 ldr r0, [r0, #0x14] cmp r0, #0 beq _02000ED6 - bl sub_02022974 + bl GF_AssertFail _02000ED6: ldr r0, _02000EE0 ; =0x02101D20 str r5, [r0, #0x10] diff --git a/asm/unk_02002328.s b/asm/unk_02002328.s index 2bb75616b2..54ad1dc3ec 100644 --- a/asm/unk_02002328.s +++ b/asm/unk_02002328.s @@ -135,7 +135,7 @@ _020023F4: lsl r0, r0, #8 cmp r5, r0 bne _02002418 - bl sub_02022974 + bl GF_AssertFail _02002418: ldr r0, _020025CC ; =0x0000F0FD cmp r5, r0 diff --git a/asm/unk_02002B7C.s b/asm/unk_02002B7C.s index 2ee13026fc..aee26e19b7 100644 --- a/asm/unk_02002B7C.s +++ b/asm/unk_02002B7C.s @@ -70,7 +70,7 @@ sub_02002BEC: ; 0x02002BEC add r5, r1, #0 cmp r4, #4 blt _02002BFA - bl sub_02022974 + bl GF_AssertFail _02002BFA: ldr r0, _02002C24 ; =0x02101D48 lsl r4, r4, #2 @@ -80,7 +80,7 @@ _02002BFA: ldr r0, [r0, #0] cmp r0, #0 bne _02002C0E - bl sub_02022974 + bl GF_AssertFail _02002C0E: ldr r0, _02002C24 ; =0x02101D48 mov r1, #0 @@ -101,7 +101,7 @@ sub_02002C28: ; 0x02002C28 add r4, r0, #0 cmp r4, #4 blt _02002C34 - bl sub_02022974 + bl GF_AssertFail _02002C34: ldr r0, _02002C5C ; =0x02101D48 lsl r4, r4, #2 @@ -111,7 +111,7 @@ _02002C34: ldr r0, [r0, #0] cmp r0, #0 bne _02002C48 - bl sub_02022974 + bl GF_AssertFail _02002C48: ldr r0, _02002C5C ; =0x02101D48 mov r1, #1 @@ -132,7 +132,7 @@ sub_02002C60: ; 0x02002C60 add r4, r0, #0 cmp r4, #4 blt _02002C6C - bl sub_02022974 + bl GF_AssertFail _02002C6C: ldr r0, _02002CF4 ; =0x02101D48 lsl r6, r4, #2 @@ -267,7 +267,7 @@ sub_02002D48: ; 0x02002D48 ldr r0, [r0, #0] cmp r0, #0 bne _02002D62 - bl sub_02022974 + bl GF_AssertFail _02002D62: ldr r0, _02002D78 ; =0x02101D48 add r1, r5, #0 @@ -295,7 +295,7 @@ sub_02002D7C: ; 0x02002D7C ldr r0, [r0, #0] cmp r0, #0 bne _02002D96 - bl sub_02022974 + bl GF_AssertFail _02002D96: add r0, r5, #0 bl sub_02023E2C @@ -325,7 +325,7 @@ sub_02002DB4: ; 0x02002DB4 ldr r0, [r0, #0] cmp r0, #0 bne _02002DCE - bl sub_02022974 + bl GF_AssertFail _02002DCE: add r0, r5, #0 bl sub_020237E8 @@ -466,7 +466,7 @@ sub_02002EB4: ; 0x02002EB4 ldr r0, [r0, #0] cmp r0, #0 bne _02002ECE - bl sub_02022974 + bl GF_AssertFail _02002ECE: add r0, r5, #0 bl sub_02023E2C @@ -511,7 +511,7 @@ sub_02002F04: ; 0x02002F04 ldr r0, [r0, #0] cmp r0, #0 bne _02002F1C - bl sub_02022974 + bl GF_AssertFail _02002F1C: add r0, r5, #0 bl sub_02023E2C diff --git a/asm/unk_02002F38.s b/asm/unk_02002F38.s index dc7fde1e4e..fdda734b22 100644 --- a/asm/unk_02002F38.s +++ b/asm/unk_02002F38.s @@ -123,7 +123,7 @@ sub_02002FEC: ; 0x02002FEC bl sub_02006F88 add r6, r0, #0 bne _02003006 - bl sub_02022974 + bl GF_AssertFail _02003006: cmp r4, #0 bne _0200300E @@ -141,7 +141,7 @@ _0200300E: add r0, r4, r0 cmp r0, r1 bls _02003028 - bl sub_02022974 + bl GF_AssertFail _02003028: lsl r0, r4, #0x10 lsr r0, r0, #0x10 @@ -197,7 +197,7 @@ sub_02003070: ; 0x02003070 add r0, r7, r0 cmp r0, r1 bls _0200308E - bl sub_02022974 + bl GF_AssertFail _0200308E: cmp r4, #3 bhi _020030C6 @@ -229,7 +229,7 @@ _020030BE: add r1, r0, #0 b _020030CC _020030C6: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _020030CC: lsl r0, r7, #0x10 @@ -255,7 +255,7 @@ sub_020030E4: ; 0x020030E4 bl sub_02006F88 add r4, r0, #0 bne _020030FA - bl sub_02022974 + bl GF_AssertFail _020030FA: cmp r5, #0 bne _02003102 @@ -1317,7 +1317,7 @@ sub_020038B0: ; 0x020038B0 ldr r0, [r0, #8] cmp r1, r0 bls _020038D6 - bl sub_02022974 + bl GF_AssertFail _020038D6: sub r0, r7, #1 cmp r0, #1 @@ -1373,7 +1373,7 @@ _02003922: ldrh r0, [r1, r0] pop {r3, pc} _02003934: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} thumb_func_end sub_02003910 @@ -1464,7 +1464,7 @@ sub_020039B0: ; 0x020039B0 _020039D2: cmp r0, #0 bne _020039DA - bl sub_02022974 + bl GF_AssertFail _020039DA: add r3, sp, #0x10 ldrh r0, [r3, #0x14] @@ -1540,7 +1540,7 @@ sub_02003A2C: ; 0x02003A2C _02003A56: cmp r0, #0 bne _02003A5E - bl sub_02022974 + bl GF_AssertFail _02003A5E: cmp r5, #0 beq _02003A88 @@ -1651,7 +1651,7 @@ sub_02003B08: ; 0x02003B08 bl sub_02006F88 add r4, r0, #0 bne _02003B20 - bl sub_02022974 + bl GF_AssertFail _02003B20: ldr r0, [sp, #0x1c] cmp r0, #0 diff --git a/asm/unk_02003B60.s b/asm/unk_02003B60.s index d7e1414813..c646c91d04 100644 --- a/asm/unk_02003B60.s +++ b/asm/unk_02003B60.s @@ -542,7 +542,7 @@ _02003F28: add r0, r0, r1 pop {r4, pc} _02003F2E: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} nop @@ -616,7 +616,7 @@ sub_02004014: ; 0x02004014 mvn r0, r0 cmp r4, r0 bne _02004032 - bl sub_02022974 + bl GF_AssertFail _02004032: cmp r5, #0 beq _02004038 @@ -718,7 +718,7 @@ sub_020040CC: ; 0x020040CC add r4, r0, #0 cmp r5, #9 blt _020040E0 - bl sub_02022974 + bl GF_AssertFail mov r5, #0 _020040E0: ldr r0, _020040EC ; =0x000BBC98 @@ -775,7 +775,7 @@ _0200412E: mov r0, #7 pop {r3, pc} _02004132: - bl sub_02022974 + bl GF_AssertFail mov r0, #3 pop {r3, pc} ; .align 2, 0 diff --git a/asm/unk_020041CC.s b/asm/unk_020041CC.s index 895fd2d5d6..4e86cac295 100644 --- a/asm/unk_020041CC.s +++ b/asm/unk_020041CC.s @@ -737,7 +737,7 @@ sub_0200478C: ; 0x0200478C add r0, r5, #0 mov r1, #4 bl sub_02004080 - bl sub_02022974 + bl GF_AssertFail b _020047C0 _020047B8: ldrh r0, [r4] @@ -805,7 +805,7 @@ _02004808: add r0, r7, #0 mov r1, #4 bl sub_02004080 - bl sub_02022974 + bl GF_AssertFail b _02004862 _0200485A: ldrh r0, [r4] @@ -951,7 +951,7 @@ sub_02004974: ; 0x02004974 bl sub_02003D54 cmp r4, #7 blt _0200498E - bl sub_02022974 + bl GF_AssertFail mov r0, #0x1b bl sub_02003D5C ldr r0, [r0, #0] @@ -1170,7 +1170,7 @@ sub_02004B04: ; 0x02004B04 push {r4, lr} add r4, r0, #0 bpl _02004B0E - bl sub_02022974 + bl GF_AssertFail _02004B0E: add r0, r4, #0 bl NNS_SndPlayerCountPlayingSeqByPlayerNo @@ -1265,21 +1265,21 @@ sub_02004B78: ; 0x02004B78 beq _02004B9C cmp r5, #0xf beq _02004B9C - bl sub_02022974 + bl GF_AssertFail _02004B9C: cmp r5, #0xe bne _02004BAA ldrb r0, [r6] cmp r0, #0 bne _02004BAA - bl sub_02022974 + bl GF_AssertFail _02004BAA: cmp r5, #0xf bne _02004BB8 ldrb r0, [r4] cmp r0, #0 bne _02004BB8 - bl sub_02022974 + bl GF_AssertFail _02004BB8: cmp r5, #0xe bne _02004BC4 @@ -1307,7 +1307,7 @@ sub_02004BCC: ; 0x02004BCC beq _02004BF0 cmp r5, #0xf beq _02004BF0 - bl sub_02022974 + bl GF_AssertFail _02004BF0: cmp r5, #0xe bne _02004C1E @@ -1329,7 +1329,7 @@ _02004C12: strb r0, [r6] b _02004C46 _02004C18: - bl sub_02022974 + bl GF_AssertFail b _02004C46 _02004C1E: ldrb r0, [r4] @@ -1350,7 +1350,7 @@ _02004C3C: strb r0, [r4] b _02004C46 _02004C42: - bl sub_02022974 + bl GF_AssertFail _02004C46: mov r0, #1 pop {r4, r5, r6, pc} @@ -1372,7 +1372,7 @@ sub_02004C4C: ; 0x02004C4C beq _02004C72 cmp r5, #0xf beq _02004C72 - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} _02004C72: cmp r5, #0xe @@ -1388,7 +1388,7 @@ _02004C72: strb r0, [r6] pop {r4, r5, r6, pc} _02004C8E: - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} _02004C94: ldrb r0, [r4] @@ -1402,7 +1402,7 @@ _02004C94: strb r0, [r4] pop {r4, r5, r6, pc} _02004CAC: - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} ; .align 2, 0 thumb_func_end sub_02004C4C @@ -1532,13 +1532,13 @@ sub_02004D78: ; 0x02004D78 beq _02004D9C cmp r5, #0xf beq _02004D9C - bl sub_02022974 + bl GF_AssertFail _02004D9C: add r0, r6, #0 bl NNS_SndArcGetWaveArcInfo add r7, r0, #0 bne _02004DB0 - bl sub_02022974 + bl GF_AssertFail add sp, #0x30 mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -1549,7 +1549,7 @@ _02004DB0: bl NNS_SndArcGetFileSize add r6, r0, #0 bne _02004DC8 - bl sub_02022974 + bl GF_AssertFail add sp, #0x30 mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -1562,7 +1562,7 @@ _02004DC8: str r0, [r4, #0] cmp r0, #0 bne _02004DE4 - bl sub_02022974 + bl GF_AssertFail add sp, #0x30 mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -1581,7 +1581,7 @@ _02004DE4: mvn r1, r1 cmp r0, r1 bne _02004E0E - bl sub_02022974 + bl GF_AssertFail add sp, #0x30 mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -1664,7 +1664,7 @@ sub_02004E84: ; 0x02004E84 beq _02004EA8 cmp r5, #0xf beq _02004EA8 - bl sub_02022974 + bl GF_AssertFail _02004EA8: add r0, r5, #0 bl sub_02004CF4 @@ -2072,7 +2072,7 @@ _02005152: bl NNS_SndArcGetWaveArcInfo cmp r0, #0 bne _02005162 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _02005162: @@ -2082,7 +2082,7 @@ _02005162: bl NNS_SndArcGetFileAddress cmp r0, #0 bne _02005178 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _02005178: diff --git a/asm/unk_02005474.s b/asm/unk_02005474.s index 13f97dcdb8..c524026c58 100644 --- a/asm/unk_02005474.s +++ b/asm/unk_02005474.s @@ -51,7 +51,7 @@ _020054BE: add r4, r0, #0 b _020054D8 _020054D0: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} _020054D8: @@ -142,7 +142,7 @@ sub_02005588: ; 0x02005588 add r5, r1, #0 cmp r0, #4 beq _02005598 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _02005598: @@ -150,7 +150,7 @@ _02005598: bl sub_02004B18 cmp r0, #7 beq _020055AA - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _020055AA: @@ -1232,7 +1232,7 @@ sub_02005E64: ; 0x02005E64 bl sub_02018144 add r4, r0, #0 bne _02005E88 - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} _02005E88: mov r2, #0 diff --git a/asm/unk_020064F0.s b/asm/unk_020064F0.s index d9ea1c84ac..f1540dea48 100644 --- a/asm/unk_020064F0.s +++ b/asm/unk_020064F0.s @@ -13,14 +13,14 @@ sub_020064F0: ; 0x020064F0 ldr r0, [r4, #4] cmp r0, #1 beq _020064FE - bl sub_02022974 + bl GF_AssertFail _020064FE: ldr r1, [r4, #0] mov r0, #0 bl FS_UnloadOverlay cmp r0, #1 beq _0200650E - bl sub_02022974 + bl GF_AssertFail _0200650E: mov r0, #0 str r0, [r4, #4] @@ -64,7 +64,7 @@ sub_02006544: ; 0x02006544 bl FS_LoadOverlayInfo cmp r0, #1 beq _0200655A - bl sub_02022974 + bl GF_AssertFail _0200655A: mov r0, #2 ldr r2, [sp, #4] @@ -136,7 +136,7 @@ _020065CC: _020065D4: cmp r6, #8 blt _020065E0 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _020065E0: @@ -174,7 +174,7 @@ _02006616: add r4, r0, #0 b _0200662A _02006622: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _0200662A: @@ -185,7 +185,7 @@ _0200662A: _02006634: cmp r4, #0 bne _02006640 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _02006640: @@ -245,7 +245,7 @@ _0200669C: cmp r3, r0 blo _020066B0 _020066A6: - bl sub_02022974 + bl GF_AssertFail add sp, #0x10 mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -296,7 +296,7 @@ sub_020066E4: ; 0x020066E4 bl FS_LoadOverlayInfo cmp r0, #0 bne _02006706 - bl sub_02022974 + bl GF_AssertFail add sp, #0x2c mov r0, #0 pop {r4, r5, pc} diff --git a/asm/unk_020068C8.s b/asm/unk_020068C8.s index bfab950836..3a691c804e 100644 --- a/asm/unk_020068C8.s +++ b/asm/unk_020068C8.s @@ -50,7 +50,7 @@ sub_020068C8: ; 0x020068C8 ldrh r0, [r0] cmp r0, r5 bgt _0200692E - bl sub_02022974 + bl GF_AssertFail _0200692E: ldr r0, [sp, #0x14] mov r2, #0 @@ -96,7 +96,7 @@ _0200698A: str r0, [sp, #0x14] cmp r0, #0 bne _02006994 - bl sub_02022974 + bl GF_AssertFail _02006994: ldr r1, [sp] ldr r2, [sp, #0x14] @@ -152,7 +152,7 @@ sub_020069A8: ; 0x020069A8 ldrh r0, [r0] cmp r0, r5 bgt _02006A0E - bl sub_02022974 + bl GF_AssertFail _02006A0E: ldr r0, [sp, #0x14] mov r2, #0 @@ -198,7 +198,7 @@ _02006A6A: str r0, [sp, #0x14] cmp r0, #0 bne _02006A74 - bl sub_02022974 + bl GF_AssertFail _02006A74: ldr r0, [sp, #0x7c] cmp r0, #0 @@ -371,7 +371,7 @@ sub_02006B58: ; 0x02006B58 ldrh r0, [r0] cmp r0, r5 bgt _02006BBE - bl sub_02022974 + bl GF_AssertFail _02006BBE: ldr r0, [sp, #0xc] mov r2, #0 @@ -410,7 +410,7 @@ _02006BBE: sub r0, r1, r0 str r0, [sp, #0xc] bne _02006C18 - bl sub_02022974 + bl GF_AssertFail _02006C18: ldr r0, [sp, #0xc] add sp, #0x58 @@ -501,7 +501,7 @@ sub_02006CB8: ; 0x02006CB8 add r6, r2, #0 cmp r0, r4 bhi _02006CCE - bl sub_02022974 + bl GF_AssertFail _02006CCE: ldr r2, [r5, #0x48] lsl r1, r4, #3 @@ -556,7 +556,7 @@ sub_02006D28: ; 0x02006D28 add r6, r2, #0 cmp r0, r4 bhi _02006D3E - bl sub_02022974 + bl GF_AssertFail _02006D3E: ldr r2, [r5, #0x48] lsl r1, r4, #3 @@ -600,7 +600,7 @@ sub_02006D84: ; 0x02006D84 add r4, r1, #0 cmp r0, r4 bhi _02006D98 - bl sub_02022974 + bl GF_AssertFail _02006D98: ldr r2, [r5, #0x48] lsl r1, r4, #3 @@ -636,7 +636,7 @@ sub_02006DC8: ; 0x02006DC8 add r7, r3, #0 cmp r0, r4 bhi _02006DDE - bl sub_02022974 + bl GF_AssertFail _02006DDE: ldr r2, [r5, #0x48] lsl r1, r4, #3 diff --git a/asm/unk_0200762C.s b/asm/unk_0200762C.s index d1c41d2564..eb49af585d 100644 --- a/asm/unk_0200762C.s +++ b/asm/unk_0200762C.s @@ -807,7 +807,7 @@ _02007C42: _02007C52: cmp r4, #4 bne _02007C5A - bl sub_02022974 + bl GF_AssertFail _02007C5A: ldr r0, [sp, #0x30] ldr r3, [sp, #0x14] @@ -843,7 +843,7 @@ sub_02007C7C: ; 0x02007C7C str r3, [sp, #4] lsr r0, r0, #0x1f beq _02007C9C - bl sub_02022974 + bl GF_AssertFail _02007C9C: add r5, r4, r6 mov r0, #0 @@ -1686,7 +1686,7 @@ _02008260: lsr r0, r0, #0x1e pop {r3, pc} _0200826A: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -2953,7 +2953,7 @@ sub_02008B38: ; 0x02008B38 push {r4, lr} add r4, r0, #0 bne _02008B42 - bl sub_02022974 + bl GF_AssertFail _02008B42: ldr r0, [r4, #0] lsl r0, r0, #0x1f diff --git a/asm/unk_020093B4.s b/asm/unk_020093B4.s index 07b7fd010e..d7467f80f3 100644 --- a/asm/unk_020093B4.s +++ b/asm/unk_020093B4.s @@ -21,33 +21,33 @@ sub_020093B4: ; 0x020093B4 str r4, [sp, #0xc] cmp r0, #0 bne _020093D2 - bl sub_02022974 + bl GF_AssertFail _020093D2: ldr r0, [sp, #0x48] cmp r0, #0 bne _020093DC - bl sub_02022974 + bl GF_AssertFail _020093DC: ldr r0, [sp, #0x50] cmp r0, #0 bne _020093E6 - bl sub_02022974 + bl GF_AssertFail _020093E6: ldr r0, [sp, #0x4c] cmp r0, #0 bne _020093F0 - bl sub_02022974 + bl GF_AssertFail _020093F0: cmp r5, #0 bne _020093F8 - bl sub_02022974 + bl GF_AssertFail _020093F8: ldr r0, [sp, #0x44] add r1, r6, #0 bl sub_02009DC8 add r7, r0, #0 bne _02009408 - bl sub_02022974 + bl GF_AssertFail _02009408: ldr r0, [sp, #0x48] ldr r1, [sp] @@ -55,7 +55,7 @@ _02009408: str r0, [sp, #0x14] cmp r0, #0 bne _0200941A - bl sub_02022974 + bl GF_AssertFail _0200941A: ldr r0, [sp, #0x4c] ldr r1, [sp, #4] @@ -63,7 +63,7 @@ _0200941A: str r0, [sp, #0x10] cmp r0, #0 bne _0200942C - bl sub_02022974 + bl GF_AssertFail _0200942C: ldr r0, [sp, #0x50] cmp r0, #0 @@ -77,7 +77,7 @@ _0200942C: str r0, [sp, #0xc] cmp r0, #0 bne _0200944A - bl sub_02022974 + bl GF_AssertFail _0200944A: ldr r0, [sp, #0x54] cmp r0, #0 @@ -107,7 +107,7 @@ _02009472: bl sub_0200A558 add r6, r0, #0 bne _02009488 - bl sub_02022974 + bl GF_AssertFail _02009488: add r0, r7, #0 bl sub_02009E1C @@ -118,7 +118,7 @@ _02009492: bl sub_0200A534 add r6, r0, #0 bne _020094A0 - bl sub_02022974 + bl GF_AssertFail _020094A0: mov r0, #0 str r0, [r5, #4] @@ -266,7 +266,7 @@ sub_020095A8: ; 0x020095A8 push {r4, lr} add r4, r0, #0 bne _020095B2 - bl sub_02022974 + bl GF_AssertFail _020095B2: ldr r0, [r4, #0] cmp r0, #0 @@ -432,7 +432,7 @@ _020096DE: bl sub_0201E9C0 pop {r4, pc} _020096EC: - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} nop _020096F4: .word 0x00100010 diff --git a/asm/unk_02009714.s b/asm/unk_02009714.s index 08579cb4b2..e4df5380ef 100644 --- a/asm/unk_02009714.s +++ b/asm/unk_02009714.s @@ -43,17 +43,17 @@ sub_02009754: ; 0x02009754 push {r4, lr} add r4, r0, #0 bne _0200975E - bl sub_02022974 + bl GF_AssertFail _0200975E: ldr r0, [r4, #0] cmp r0, #0 bne _02009768 - bl sub_02022974 + bl GF_AssertFail _02009768: ldr r0, [r4, #4] cmp r0, #0 bne _02009772 - bl sub_02022974 + bl GF_AssertFail _02009772: add r0, r4, #0 bl sub_02009D9C @@ -80,29 +80,29 @@ sub_02009794: ; 0x02009794 add r7, r3, #0 cmp r5, #0 bne _020097A8 - bl sub_02022974 + bl GF_AssertFail _020097A8: cmp r4, #0 bne _020097B0 - bl sub_02022974 + bl GF_AssertFail _020097B0: ldr r0, [r4, #4] cmp r0, r6 bgt _020097BA - bl sub_02022974 + bl GF_AssertFail _020097BA: ldr r1, [r5, #0x10] ldr r0, [r4, #8] cmp r1, r0 beq _020097C6 - bl sub_02022974 + bl GF_AssertFail _020097C6: add r0, r5, #0 bl sub_0200A0A8 str r0, [sp, #0x1c] cmp r0, #0 bne _020097D6 - bl sub_02022974 + bl GF_AssertFail _020097D6: ldrb r0, [r4, #0xc] cmp r0, #0 @@ -117,7 +117,7 @@ _020097D6: bl sub_02009D34 cmp r0, #1 beq _020097F6 - bl sub_02022974 + bl GF_AssertFail _020097F6: ldr r0, [r6, #0x44] ldr r1, [sp, #0x1c] @@ -142,7 +142,7 @@ _02009812: bl sub_02009D34 cmp r0, #1 beq _0200982A - bl sub_02022974 + bl GF_AssertFail _0200982A: ldr r0, [r6, #8] ldr r1, [sp, #0x1c] @@ -181,18 +181,18 @@ sub_0200985C: ; 0x0200985C str r2, [sp, #0x1c] cmp r5, #0 bne _02009870 - bl sub_02022974 + bl GF_AssertFail _02009870: ldr r0, [r5, #0x10] cmp r0, #0 beq _0200987A - bl sub_02022974 + bl GF_AssertFail _0200987A: add r0, r5, #0 bl sub_0200A0A8 add r6, r0, #0 bne _02009888 - bl sub_02022974 + bl GF_AssertFail _02009888: ldr r0, [sp, #0x38] str r4, [sp] @@ -229,18 +229,18 @@ sub_020098B8: ; 0x020098B8 str r2, [sp, #0x1c] cmp r5, #0 bne _020098CC - bl sub_02022974 + bl GF_AssertFail _020098CC: ldr r0, [r5, #0x10] cmp r0, #1 beq _020098D6 - bl sub_02022974 + bl GF_AssertFail _020098D6: add r0, r5, #0 bl sub_0200A0A8 add r6, r0, #0 bne _020098E4 - bl sub_02022974 + bl GF_AssertFail _020098E4: ldr r0, [sp, #0x38] str r4, [sp] @@ -279,13 +279,13 @@ sub_02009918: ; 0x02009918 str r2, [sp, #0x1c] cmp r5, #0 bne _0200992C - bl sub_02022974 + bl GF_AssertFail _0200992C: add r0, r5, #0 bl sub_0200A0A8 add r6, r0, #0 bne _0200993A - bl sub_02022974 + bl GF_AssertFail _0200993A: ldr r0, [sp, #0x38] str r4, [sp] @@ -321,21 +321,21 @@ sub_02009968: ; 0x02009968 str r3, [sp, #0x20] cmp r5, #0 bne _0200997C - bl sub_02022974 + bl GF_AssertFail _0200997C: ldr r0, [r5, #0x10] cmp r0, #0 beq _02009986 - bl sub_02022974 + bl GF_AssertFail _02009986: cmp r4, #0 bne _0200998E - bl sub_02022974 + bl GF_AssertFail _0200998E: ldr r0, [r4, #4] cmp r0, #0 beq _02009998 - bl sub_02022974 + bl GF_AssertFail _02009998: add r0, r4, #0 bl sub_02009E08 @@ -375,21 +375,21 @@ sub_020099D4: ; 0x020099D4 str r3, [sp, #0x20] cmp r5, #0 bne _020099E8 - bl sub_02022974 + bl GF_AssertFail _020099E8: ldr r0, [r5, #0x10] cmp r0, #1 beq _020099F2 - bl sub_02022974 + bl GF_AssertFail _020099F2: cmp r4, #0 bne _020099FA - bl sub_02022974 + bl GF_AssertFail _020099FA: ldr r0, [r4, #4] cmp r0, #1 beq _02009A04 - bl sub_02022974 + bl GF_AssertFail _02009A04: add r0, r4, #0 bl sub_02009E08 @@ -434,18 +434,18 @@ sub_02009A4C: ; 0x02009A4C str r2, [sp, #0x1c] cmp r5, #0 bne _02009A60 - bl sub_02022974 + bl GF_AssertFail _02009A60: ldr r0, [r5, #0x10] cmp r0, #0 beq _02009A6A - bl sub_02022974 + bl GF_AssertFail _02009A6A: add r0, r5, #0 bl sub_0200A0A8 add r6, r0, #0 bne _02009A78 - bl sub_02022974 + bl GF_AssertFail _02009A78: ldr r0, [sp, #0x38] str r4, [sp] @@ -482,18 +482,18 @@ sub_02009AA8: ; 0x02009AA8 str r2, [sp, #0x1c] cmp r5, #0 bne _02009ABC - bl sub_02022974 + bl GF_AssertFail _02009ABC: ldr r0, [r5, #0x10] cmp r0, #0 beq _02009AC6 - bl sub_02022974 + bl GF_AssertFail _02009AC6: add r0, r5, #0 bl sub_0200A0A8 add r6, r0, #0 bne _02009AD4 - bl sub_02022974 + bl GF_AssertFail _02009AD4: ldr r0, [sp, #0x38] str r4, [sp] @@ -530,18 +530,18 @@ sub_02009B04: ; 0x02009B04 str r2, [sp, #0x1c] cmp r5, #0 bne _02009B18 - bl sub_02022974 + bl GF_AssertFail _02009B18: ldr r0, [r5, #0x10] cmp r0, #1 beq _02009B22 - bl sub_02022974 + bl GF_AssertFail _02009B22: add r0, r5, #0 bl sub_0200A0A8 add r6, r0, #0 bne _02009B30 - bl sub_02022974 + bl GF_AssertFail _02009B30: ldr r0, [sp, #0x38] str r4, [sp] @@ -580,18 +580,18 @@ sub_02009B64: ; 0x02009B64 str r2, [sp, #0x1c] cmp r5, #0 bne _02009B78 - bl sub_02022974 + bl GF_AssertFail _02009B78: ldr r0, [r5, #0x10] cmp r0, #1 beq _02009B82 - bl sub_02022974 + bl GF_AssertFail _02009B82: add r0, r5, #0 bl sub_0200A0A8 add r6, r0, #0 bne _02009B90 - bl sub_02022974 + bl GF_AssertFail _02009B90: ldr r0, [sp, #0x38] str r4, [sp] @@ -630,13 +630,13 @@ sub_02009BC4: ; 0x02009BC4 str r2, [sp, #0x1c] cmp r5, #0 bne _02009BD8 - bl sub_02022974 + bl GF_AssertFail _02009BD8: add r0, r5, #0 bl sub_0200A0A8 add r6, r0, #0 bne _02009BE6 - bl sub_02022974 + bl GF_AssertFail _02009BE6: ldr r0, [sp, #0x38] str r4, [sp] @@ -672,21 +672,21 @@ sub_02009C14: ; 0x02009C14 str r3, [sp, #0x20] cmp r5, #0 bne _02009C28 - bl sub_02022974 + bl GF_AssertFail _02009C28: ldr r0, [r5, #0x10] cmp r0, #0 beq _02009C32 - bl sub_02022974 + bl GF_AssertFail _02009C32: cmp r4, #0 bne _02009C3A - bl sub_02022974 + bl GF_AssertFail _02009C3A: ldr r0, [r4, #4] cmp r0, #0 beq _02009C44 - bl sub_02022974 + bl GF_AssertFail _02009C44: add r0, r4, #0 bl sub_02009E08 @@ -726,11 +726,11 @@ sub_02009C80: ; 0x02009C80 add r7, r3, #0 cmp r5, #0 bne _02009C94 - bl sub_02022974 + bl GF_AssertFail _02009C94: cmp r4, #0 bne _02009C9C - bl sub_02022974 + bl GF_AssertFail _02009C9C: str r6, [sp] str r7, [sp, #4] @@ -826,7 +826,7 @@ sub_02009D34: ; 0x02009D34 add r4, r1, #0 cmp r5, #0 bne _02009D42 - bl sub_02022974 + bl GF_AssertFail _02009D42: ldr r0, [r5, #0] add r1, r4, #0 @@ -839,7 +839,7 @@ sub_02009D4C: ; 0x02009D4C push {r4, lr} add r4, r0, #0 bne _02009D56 - bl sub_02022974 + bl GF_AssertFail _02009D56: add r0, r4, #0 bl sub_0200A1F8 @@ -857,12 +857,12 @@ sub_02009D68: ; 0x02009D68 add r4, r1, #0 cmp r5, #0 bne _02009D76 - bl sub_02022974 + bl GF_AssertFail _02009D76: ldr r0, [r5, #4] cmp r0, #0 bne _02009D80 - bl sub_02022974 + bl GF_AssertFail _02009D80: add r0, r4, #0 bl sub_0200A1F8 @@ -913,7 +913,7 @@ sub_02009DC8: ; 0x02009DC8 add r7, r1, #0 cmp r5, #0 bne _02009DD6 - bl sub_02022974 + bl GF_AssertFail _02009DD6: ldr r0, [r5, #8] mov r6, #0 @@ -949,7 +949,7 @@ sub_02009E08: ; 0x02009E08 push {r4, lr} add r4, r0, #0 bne _02009E12 - bl sub_02022974 + bl GF_AssertFail _02009E12: ldr r0, [r4, #0] bl sub_02022B80 @@ -964,7 +964,7 @@ sub_02009E1C: ; 0x02009E1C ldr r0, [r4, #4] cmp r0, #0 beq _02009E2A - bl sub_02022974 + bl GF_AssertFail _02009E2A: add r0, r4, #0 bl sub_0200A20C @@ -979,7 +979,7 @@ sub_02009E34: ; 0x02009E34 ldr r0, [r4, #4] cmp r0, #1 beq _02009E42 - bl sub_02022974 + bl GF_AssertFail _02009E42: add r0, r4, #0 bl sub_0200A20C @@ -994,7 +994,7 @@ sub_02009E4C: ; 0x02009E4C ldr r0, [r4, #4] cmp r0, #2 beq _02009E5A - bl sub_02022974 + bl GF_AssertFail _02009E5A: add r0, r4, #0 bl sub_0200A20C @@ -1009,7 +1009,7 @@ sub_02009E64: ; 0x02009E64 ldr r0, [r4, #4] cmp r0, #3 beq _02009E72 - bl sub_02022974 + bl GF_AssertFail _02009E72: add r0, r4, #0 bl sub_0200A20C @@ -1024,7 +1024,7 @@ sub_02009E7C: ; 0x02009E7C ldr r0, [r4, #4] cmp r0, #4 beq _02009E8A - bl sub_02022974 + bl GF_AssertFail _02009E8A: add r0, r4, #0 bl sub_0200A20C @@ -1039,7 +1039,7 @@ sub_02009E94: ; 0x02009E94 ldr r0, [r4, #4] cmp r0, #5 beq _02009EA2 - bl sub_02022974 + bl GF_AssertFail _02009EA2: add r0, r4, #0 bl sub_0200A20C @@ -1052,7 +1052,7 @@ sub_02009EAC: ; 0x02009EAC push {r4, lr} add r4, r0, #0 bne _02009EB6 - bl sub_02022974 + bl GF_AssertFail _02009EB6: ldr r0, [r4, #4] pop {r4, pc} @@ -1064,7 +1064,7 @@ sub_02009EBC: ; 0x02009EBC push {r4, lr} add r4, r0, #0 bne _02009EC6 - bl sub_02022974 + bl GF_AssertFail _02009EC6: ldr r0, [r4, #4] cmp r0, #0 @@ -1090,7 +1090,7 @@ sub_02009EE8: ; 0x02009EE8 push {r4, lr} add r4, r0, #0 bne _02009EF2 - bl sub_02022974 + bl GF_AssertFail _02009EF2: ldr r0, [r4, #4] cmp r0, #1 @@ -1112,7 +1112,7 @@ sub_02009F08: ; 0x02009F08 add r4, r1, #0 cmp r5, #0 bne _02009F16 - bl sub_02022974 + bl GF_AssertFail _02009F16: ldr r0, [r5, #4] cmp r0, #0 @@ -1153,7 +1153,7 @@ sub_02009F40: ; 0x02009F40 add r6, r2, #0 cmp r4, #0 bne _02009F50 - bl sub_02022974 + bl GF_AssertFail _02009F50: ldr r0, [r5, #0] str r0, [r4, #8] @@ -1208,7 +1208,7 @@ sub_02009FA4: ; 0x02009FA4 push {r4, lr} add r4, r0, #0 bne _02009FAE - bl sub_02022974 + bl GF_AssertFail _02009FAE: ldr r0, [r4, #4] pop {r4, pc} @@ -1222,12 +1222,12 @@ sub_02009FB4: ; 0x02009FB4 add r4, r1, #0 cmp r5, #0 bne _02009FC2 - bl sub_02022974 + bl GF_AssertFail _02009FC2: ldr r0, [r5, #4] cmp r0, r4 bgt _02009FCC - bl sub_02022974 + bl GF_AssertFail _02009FCC: ldrb r0, [r5, #0xc] ldr r1, [r5, #0] @@ -1253,12 +1253,12 @@ sub_02009FE8: ; 0x02009FE8 add r4, r1, #0 cmp r5, #0 bne _02009FF6 - bl sub_02022974 + bl GF_AssertFail _02009FF6: ldr r0, [r5, #4] cmp r0, r4 bgt _0200A000 - bl sub_02022974 + bl GF_AssertFail _0200A000: ldrb r0, [r5, #0xc] cmp r0, #1 @@ -1280,12 +1280,12 @@ sub_0200A014: ; 0x0200A014 add r4, r1, #0 cmp r5, #0 bne _0200A022 - bl sub_02022974 + bl GF_AssertFail _0200A022: ldr r0, [r5, #4] cmp r0, r4 bgt _0200A02C - bl sub_02022974 + bl GF_AssertFail _0200A02C: ldrb r0, [r5, #0xc] cmp r0, #1 @@ -1307,12 +1307,12 @@ sub_0200A040: ; 0x0200A040 add r4, r1, #0 cmp r5, #0 bne _0200A04E - bl sub_02022974 + bl GF_AssertFail _0200A04E: ldr r0, [r5, #4] cmp r0, r4 bgt _0200A058 - bl sub_02022974 + bl GF_AssertFail _0200A058: ldrb r0, [r5, #0xc] ldr r1, [r5, #0] @@ -1338,12 +1338,12 @@ sub_0200A074: ; 0x0200A074 add r4, r1, #0 cmp r5, #0 bne _0200A082 - bl sub_02022974 + bl GF_AssertFail _0200A082: ldr r0, [r5, #4] cmp r0, r4 bgt _0200A08C - bl sub_02022974 + bl GF_AssertFail _0200A08C: ldrb r0, [r5, #0xc] ldr r1, [r5, #0] @@ -1573,12 +1573,12 @@ sub_0200A20C: ; 0x0200A20C push {r4, lr} add r4, r0, #0 bne _0200A216 - bl sub_02022974 + bl GF_AssertFail _0200A216: ldr r0, [r4, #8] cmp r0, #0 bne _0200A220 - bl sub_02022974 + bl GF_AssertFail _0200A220: ldr r0, [r4, #8] pop {r4, pc} diff --git a/asm/unk_0200A328.s b/asm/unk_0200A328.s index 549c14e9bb..f9d2818ba4 100644 --- a/asm/unk_0200A328.s +++ b/asm/unk_0200A328.s @@ -12,13 +12,13 @@ sub_0200A328: ; 0x0200A328 sub sp, #0x10 add r4, r0, #0 bne _0200A334 - bl sub_02022974 + bl GF_AssertFail _0200A334: add r0, r4, #0 bl sub_02009EAC cmp r0, #0 beq _0200A342 - bl sub_02022974 + bl GF_AssertFail _0200A342: add r0, r4, #0 bl sub_02009E1C @@ -42,7 +42,7 @@ sub_0200A368: ; 0x0200A368 push {r4, r5, r6, lr} add r5, r0, #0 bne _0200A372 - bl sub_02022974 + bl GF_AssertFail _0200A372: ldr r0, [r5, #4] mov r6, #0 @@ -57,7 +57,7 @@ _0200A37C: bl sub_0200A328 cmp r0, #0 bne _0200A390 - bl sub_02022974 + bl GF_AssertFail _0200A390: ldr r0, [r5, #4] add r6, r6, #1 @@ -74,13 +74,13 @@ sub_0200A39C: ; 0x0200A39C sub sp, #0x10 add r4, r0, #0 bne _0200A3A8 - bl sub_02022974 + bl GF_AssertFail _0200A3A8: add r0, r4, #0 bl sub_02009EAC cmp r0, #0 beq _0200A3B6 - bl sub_02022974 + bl GF_AssertFail _0200A3B6: add r0, r4, #0 bl sub_02009E1C @@ -105,13 +105,13 @@ sub_0200A3DC: ; 0x0200A3DC sub sp, #0x10 add r4, r0, #0 bne _0200A3E8 - bl sub_02022974 + bl GF_AssertFail _0200A3E8: add r0, r4, #0 bl sub_02009EAC cmp r0, #0 beq _0200A3F6 - bl sub_02022974 + bl GF_AssertFail _0200A3F6: add r0, r4, #0 bl sub_02009E1C @@ -135,7 +135,7 @@ sub_0200A41C: ; 0x0200A41C push {r4, r5, r6, lr} add r5, r0, #0 bne _0200A426 - bl sub_02022974 + bl GF_AssertFail _0200A426: ldr r0, [r5, #4] mov r6, #0 @@ -150,7 +150,7 @@ _0200A430: bl sub_0200A3DC cmp r0, #0 bne _0200A444 - bl sub_02022974 + bl GF_AssertFail _0200A444: ldr r0, [r5, #4] add r6, r6, #1 @@ -167,13 +167,13 @@ sub_0200A450: ; 0x0200A450 sub sp, #0x10 add r4, r0, #0 bne _0200A45C - bl sub_02022974 + bl GF_AssertFail _0200A45C: add r0, r4, #0 bl sub_02009EAC cmp r0, #0 beq _0200A46A - bl sub_02022974 + bl GF_AssertFail _0200A46A: add r0, r4, #0 bl sub_02009E1C @@ -199,11 +199,11 @@ sub_0200A490: ; 0x0200A490 add r5, r1, #0 cmp r4, #0 bne _0200A49E - bl sub_02022974 + bl GF_AssertFail _0200A49E: cmp r5, #0 bne _0200A4A6 - bl sub_02022974 + bl GF_AssertFail _0200A4A6: add r0, r4, #0 bl sub_02009E08 @@ -222,7 +222,7 @@ sub_0200A4C0: ; 0x0200A4C0 push {r3, r4, r5, lr} add r5, r0, #0 bne _0200A4CA - bl sub_02022974 + bl GF_AssertFail _0200A4CA: add r0, r5, #0 bl sub_02009E08 @@ -241,13 +241,13 @@ sub_0200A4E4: ; 0x0200A4E4 push {r4, lr} add r4, r0, #0 bne _0200A4EE - bl sub_02022974 + bl GF_AssertFail _0200A4EE: add r0, r4, #0 bl sub_02009EAC cmp r0, #0 beq _0200A4FC - bl sub_02022974 + bl GF_AssertFail _0200A4FC: add r0, r4, #0 bl sub_02009E08 @@ -260,7 +260,7 @@ sub_0200A508: ; 0x0200A508 push {r4, r5, r6, lr} add r5, r0, #0 bne _0200A512 - bl sub_02022974 + bl GF_AssertFail _0200A512: ldr r0, [r5, #4] mov r6, #0 @@ -288,13 +288,13 @@ sub_0200A534: ; 0x0200A534 push {r4, lr} add r4, r0, #0 bne _0200A53E - bl sub_02022974 + bl GF_AssertFail _0200A53E: add r0, r4, #0 bl sub_02009EAC cmp r0, #0 beq _0200A54C - bl sub_02022974 + bl GF_AssertFail _0200A54C: add r0, r4, #0 bl sub_02009E08 @@ -309,23 +309,23 @@ sub_0200A558: ; 0x0200A558 add r5, r1, #0 cmp r4, #0 bne _0200A566 - bl sub_02022974 + bl GF_AssertFail _0200A566: add r0, r4, #0 bl sub_02009EAC cmp r0, #0 beq _0200A574 - bl sub_02022974 + bl GF_AssertFail _0200A574: cmp r5, #0 bne _0200A57C - bl sub_02022974 + bl GF_AssertFail _0200A57C: add r0, r5, #0 bl sub_02009EAC cmp r0, #2 beq _0200A58A - bl sub_02022974 + bl GF_AssertFail _0200A58A: add r0, r4, #0 bl sub_02009E08 @@ -351,7 +351,7 @@ sub_0200A5B4: ; 0x0200A5B4 push {r4, lr} add r4, r0, #0 bne _0200A5BE - bl sub_02022974 + bl GF_AssertFail _0200A5BE: add r0, r4, #0 bl sub_0201ED1C @@ -365,13 +365,13 @@ sub_0200A5C8: ; 0x0200A5C8 sub sp, #0x10 add r4, r0, #0 bne _0200A5D4 - bl sub_02022974 + bl GF_AssertFail _0200A5D4: add r0, r4, #0 bl sub_02009EAC cmp r0, #1 beq _0200A5E2 - bl sub_02022974 + bl GF_AssertFail _0200A5E2: add r0, r4, #0 bl sub_02009E34 @@ -396,7 +396,7 @@ sub_0200A60C: ; 0x0200A60C push {r4, r5, r6, lr} add r5, r0, #0 bne _0200A616 - bl sub_02022974 + bl GF_AssertFail _0200A616: ldr r0, [r5, #4] mov r6, #0 @@ -411,7 +411,7 @@ _0200A620: bl sub_0200A5C8 cmp r0, #0 bne _0200A634 - bl sub_02022974 + bl GF_AssertFail _0200A634: ldr r0, [r5, #4] add r6, r6, #1 @@ -428,13 +428,13 @@ sub_0200A640: ; 0x0200A640 sub sp, #0x10 add r4, r0, #0 bne _0200A64C - bl sub_02022974 + bl GF_AssertFail _0200A64C: add r0, r4, #0 bl sub_02009EAC cmp r0, #1 beq _0200A65A - bl sub_02022974 + bl GF_AssertFail _0200A65A: add r0, r4, #0 bl sub_02009E34 @@ -459,7 +459,7 @@ sub_0200A684: ; 0x0200A684 push {r4, r5, r6, lr} add r5, r0, #0 bne _0200A68E - bl sub_02022974 + bl GF_AssertFail _0200A68E: ldr r0, [r5, #4] mov r6, #0 @@ -474,7 +474,7 @@ _0200A698: bl sub_0200A640 cmp r0, #0 bne _0200A6AC - bl sub_02022974 + bl GF_AssertFail _0200A6AC: ldr r0, [r5, #4] add r6, r6, #1 @@ -490,7 +490,7 @@ sub_0200A6B8: ; 0x0200A6B8 push {r3, r4, r5, lr} add r5, r0, #0 bne _0200A6C2 - bl sub_02022974 + bl GF_AssertFail _0200A6C2: add r0, r5, #0 bl sub_02009E08 @@ -509,13 +509,13 @@ sub_0200A6DC: ; 0x0200A6DC push {r4, lr} add r4, r0, #0 bne _0200A6E6 - bl sub_02022974 + bl GF_AssertFail _0200A6E6: add r0, r4, #0 bl sub_02009EAC cmp r0, #1 beq _0200A6F4 - bl sub_02022974 + bl GF_AssertFail _0200A6F4: add r0, r4, #0 bl sub_02009E08 @@ -528,7 +528,7 @@ sub_0200A700: ; 0x0200A700 push {r4, r5, r6, lr} add r5, r0, #0 bne _0200A70A - bl sub_02022974 + bl GF_AssertFail _0200A70A: ldr r0, [r5, #4] mov r6, #0 @@ -558,13 +558,13 @@ sub_0200A72C: ; 0x0200A72C add r4, r1, #0 cmp r5, #0 bne _0200A73A - bl sub_02022974 + bl GF_AssertFail _0200A73A: add r0, r5, #0 bl sub_02009EAC cmp r0, #1 beq _0200A748 - bl sub_02022974 + bl GF_AssertFail _0200A748: add r0, r5, #0 bl sub_02009E08 diff --git a/asm/unk_0200A784.s b/asm/unk_0200A784.s index 6597196d5b..a0c4c9874c 100644 --- a/asm/unk_0200A784.s +++ b/asm/unk_0200A784.s @@ -58,7 +58,7 @@ sub_0200A7C8: ; 0x0200A7C8 add r7, r3, #0 cmp r0, #0 beq _0200A7E0 - bl sub_02022974 + bl GF_AssertFail _0200A7E0: ldr r0, [sp, #0x30] mov r1, #0x3c @@ -67,7 +67,7 @@ _0200A7E0: cmp r0, #0 str r0, [r1, #0] bne _0200A7F4 - bl sub_02022974 + bl GF_AssertFail _0200A7F4: ldr r1, _0200A854 ; =0x021BF430 lsl r3, r6, #0x10 @@ -88,7 +88,7 @@ _0200A7F4: bl NNS_G2dGetNewOamManagerInstance cmp r0, #0 bne _0200A820 - bl sub_02022974 + bl GF_AssertFail _0200A820: ldr r0, [sp, #0x2c] ldr r1, [sp, #0x20] @@ -111,7 +111,7 @@ _0200A820: bl NNS_G2dGetNewOamManagerInstance cmp r0, #0 bne _0200A850 - bl sub_02022974 + bl GF_AssertFail _0200A850: add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -144,7 +144,7 @@ sub_0200A878: ; 0x0200A878 ldr r0, [r0, #0] cmp r0, #0 bne _0200A886 - bl sub_02022974 + bl GF_AssertFail _0200A886: ldr r0, _0200A8AC ; =0x021BF430 ldr r0, [r0, #0] @@ -177,7 +177,7 @@ sub_0200A8B0: ; 0x0200A8B0 add r4, r3, #0 cmp r0, #0 bne _0200A8C8 - bl sub_02022974 + bl GF_AssertFail _0200A8C8: cmp r5, #1 bne _0200A8E4 @@ -221,7 +221,7 @@ sub_0200A914: ; 0x0200A914 ldr r0, [r0, #0] cmp r0, #0 bne _0200A924 - bl sub_02022974 + bl GF_AssertFail _0200A924: cmp r4, #0 bne _0200A92E @@ -264,7 +264,7 @@ sub_0200A94C: ; 0x0200A94C bl NNS_G2dEntryOamManagerOamWithAffineIdx add r4, r0, #0 bne _0200A964 - bl sub_02022974 + bl GF_AssertFail _0200A964: add r0, r4, #0 pop {r4, pc} @@ -284,7 +284,7 @@ sub_0200A96C: ; 0x0200A96C bl NNS_G2dEntryOamManagerOamWithAffineIdx add r4, r0, #0 bne _0200A986 - bl sub_02022974 + bl GF_AssertFail _0200A986: add r0, r4, #0 pop {r4, pc} @@ -303,7 +303,7 @@ sub_0200A990: ; 0x0200A990 ldr r0, _0200A9B0 ; =0x0000FFFE cmp r4, r0 bne _0200A9A8 - bl sub_02022974 + bl GF_AssertFail _0200A9A8: add r0, r4, #0 pop {r4, pc} @@ -324,7 +324,7 @@ sub_0200A9B4: ; 0x0200A9B4 ldr r0, _0200A9D8 ; =0x0000FFFE cmp r4, r0 bne _0200A9CE - bl sub_02022974 + bl GF_AssertFail _0200A9CE: add r0, r4, #0 pop {r4, pc} diff --git a/asm/unk_0200A9DC.s b/asm/unk_0200A9DC.s index 6b5336fbfc..aa071198d5 100644 --- a/asm/unk_0200A9DC.s +++ b/asm/unk_0200A9DC.s @@ -101,7 +101,7 @@ sub_0200AA78: ; 0x0200AA78 add r7, r3, #0 cmp r0, #0 beq _0200AA8C - bl sub_02022974 + bl GF_AssertFail _0200AA8C: ldr r1, [sp, #0x18] mov r0, #1 diff --git a/asm/unk_0200AC5C.s b/asm/unk_0200AC5C.s index 15e81b4cdc..afdd8295e4 100644 --- a/asm/unk_0200AC5C.s +++ b/asm/unk_0200AC5C.s @@ -81,7 +81,7 @@ _0200ACC2: add sp, #8 pop {r3, r4, r5, r6, r7, pc} _0200ACDC: - bl sub_02022974 + bl GF_AssertFail _0200ACE0: add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -263,7 +263,7 @@ _0200AE2E: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} _0200AE42: - bl sub_02022974 + bl GF_AssertFail ldr r0, [sp] bl sub_020237E8 _0200AE4C: @@ -361,7 +361,7 @@ _0200AEFE: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _0200AF04: - bl sub_02022974 + bl GF_AssertFail ldr r1, [sp] mov r0, #4 bl sub_02023790 @@ -481,7 +481,7 @@ _0200AFE2: add sp, #0x14 pop {r4, r5, r6, r7, pc} _0200AFF6: - bl sub_02022974 + bl GF_AssertFail ldr r0, [sp, #0x28] bl sub_020237E8 _0200B000: @@ -615,7 +615,7 @@ _0200B0FC: add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} _0200B102: - bl sub_02022974 + bl GF_AssertFail mov r0, #4 add r1, r5, #0 bl sub_02023790 diff --git a/asm/unk_0200B358.s b/asm/unk_0200B358.s index b85e4397fc..776303eaac 100644 --- a/asm/unk_0200B358.s +++ b/asm/unk_0200B358.s @@ -25,12 +25,12 @@ sub_0200B368: ; 0x0200B368 str r1, [sp] str r2, [sp, #4] bne _0200B378 - bl sub_02022974 + bl GF_AssertFail _0200B378: ldr r0, [sp] cmp r0, #0 bne _0200B382 - bl sub_02022974 + bl GF_AssertFail _0200B382: ldr r0, [sp, #4] mov r1, #0x10 @@ -94,7 +94,7 @@ sub_0200B3F0: ; 0x0200B3F0 ldr r0, [r5, #0] cmp r0, #0 bne _0200B3FE - bl sub_02022974 + bl GF_AssertFail _0200B3FE: ldr r0, [r5, #8] cmp r0, #0 @@ -149,7 +149,7 @@ sub_0200B448: ; 0x0200B448 add r4, r3, #0 cmp r6, r0 blo _0200B45C - bl sub_02022974 + bl GF_AssertFail _0200B45C: ldr r0, [r5, #0] cmp r6, r0 @@ -2128,7 +2128,7 @@ sub_0200C338: ; 0x0200C338 add r6, r0, #0 cmp r4, #5 bls _0200C356 - bl sub_02022974 + bl GF_AssertFail _0200C356: cmp r6, #0 beq _0200C380 @@ -2185,7 +2185,7 @@ _0200C3A4: ldr r0, [r7, #0] cmp r4, r0 blo _0200C3C8 - bl sub_02022974 + bl GF_AssertFail _0200C3C8: ldr r2, [r7, #8] lsl r1, r4, #3 diff --git a/asm/unk_0200C6E4.s b/asm/unk_0200C6E4.s index 7b0169c660..ad4b9a4915 100644 --- a/asm/unk_0200C6E4.s +++ b/asm/unk_0200C6E4.s @@ -31,7 +31,7 @@ sub_0200C704: ; 0x0200C704 push {r4, lr} add r4, r0, #0 bne _0200C70E - bl sub_02022974 + bl GF_AssertFail _0200C70E: ldr r0, [r4, #0] mov r1, #0x58 @@ -73,7 +73,7 @@ sub_0200C73C: ; 0x0200C73C add r7, r3, #0 cmp r5, #0 bne _0200C750 - bl sub_02022974 + bl GF_AssertFail _0200C750: cmp r5, #0 bne _0200C75A @@ -164,7 +164,7 @@ sub_0200C7EC: ; 0x0200C7EC push {r4, lr} add r4, r0, #0 bne _0200C7F6 - bl sub_02022974 + bl GF_AssertFail _0200C7F6: ldr r0, [r4, #0] bl sub_020219F8 @@ -306,7 +306,7 @@ sub_0200C8D4: ; 0x0200C8D4 ldr r0, [r4, #4] cmp r0, #0 beq _0200C8E2 - bl sub_02022974 + bl GF_AssertFail _0200C8E2: add r0, r4, #0 bl sub_0200C880 @@ -731,7 +731,7 @@ _0200CBFA: mov r0, #1 pop {r4, r5, r6, r7, pc} _0200CC28: - bl sub_02022974 + bl GF_AssertFail cmp r5, #0 beq _0200CC36 add sp, #0xc @@ -781,7 +781,7 @@ _0200CC5A: mov r0, #1 pop {r4, r5, r6, r7, pc} _0200CC88: - bl sub_02022974 + bl GF_AssertFail cmp r5, #0 beq _0200CC96 add sp, #0xc @@ -829,7 +829,7 @@ _0200CCBC: bl sub_0200A640 cmp r0, #1 beq _0200CCE8 - bl sub_02022974 + bl GF_AssertFail _0200CCE8: ldr r0, [r4, #0x28] add r1, r5, #0 @@ -842,7 +842,7 @@ _0200CCE8: asr r0, r0, #0x18 pop {r3, r4, r5, r6, r7, pc} _0200CD00: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 mvn r0, r0 add sp, #0x10 @@ -885,7 +885,7 @@ _0200CD2C: bl sub_0200A640 cmp r0, #1 beq _0200CD58 - bl sub_02022974 + bl GF_AssertFail _0200CD58: ldr r0, [r4, #0x28] add r1, r5, #0 @@ -898,7 +898,7 @@ _0200CD58: asr r0, r0, #0x18 pop {r3, r4, r5, r6, r7, pc} _0200CD70: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 mvn r0, r0 add sp, #0x10 @@ -1270,7 +1270,7 @@ _0200CFF8: bl sub_02021E90 b _0200D044 _0200D040: - bl sub_02022974 + bl GF_AssertFail _0200D044: add r0, r4, #0 add sp, #0x74 @@ -1444,13 +1444,13 @@ _0200D142: add r4, r0, #0 cmp r4, #1 beq _0200D172 - bl sub_02022974 + bl GF_AssertFail _0200D172: add sp, #0x14 add r0, r4, #0 pop {r4, r5, r6, r7, pc} _0200D178: - bl sub_02022974 + bl GF_AssertFail cmp r5, #0 beq _0200D186 add sp, #0x14 @@ -1503,13 +1503,13 @@ _0200D1B2: add r4, r0, #0 cmp r4, #1 beq _0200D1E2 - bl sub_02022974 + bl GF_AssertFail _0200D1E2: add sp, #0x14 add r0, r4, #0 pop {r4, r5, r6, r7, pc} _0200D1E8: - bl sub_02022974 + bl GF_AssertFail cmp r5, #0 beq _0200D1F6 add sp, #0x14 @@ -2566,7 +2566,7 @@ _0200D846: mov r0, #1 pop {r4, r5, r6, r7, pc} _0200D874: - bl sub_02022974 + bl GF_AssertFail cmp r5, #0 beq _0200D882 add sp, #0xc @@ -2616,7 +2616,7 @@ _0200D8A6: mov r0, #1 pop {r4, r5, r6, r7, pc} _0200D8D4: - bl sub_02022974 + bl GF_AssertFail cmp r5, #0 beq _0200D8E2 add sp, #0xc @@ -2666,7 +2666,7 @@ _0200D906: mov r0, #1 pop {r4, r5, r6, r7, pc} _0200D934: - bl sub_02022974 + bl GF_AssertFail cmp r5, #0 beq _0200D942 add sp, #0xc diff --git a/asm/unk_0200F174.s b/asm/unk_0200F174.s index 36c2494f7d..59b202fae2 100644 --- a/asm/unk_0200F174.s +++ b/asm/unk_0200F174.s @@ -17,18 +17,18 @@ sub_0200F174: ; 0x0200F174 add r6, r3, #0 cmp r0, #0 bne _0200F18A - bl sub_02022974 + bl GF_AssertFail _0200F18A: ldr r0, [sp, #0x34] cmp r0, #0 bne _0200F194 - bl sub_02022974 + bl GF_AssertFail _0200F194: ldr r0, _0200F250 ; =0x021BF5B4 ldrh r0, [r0, #0xc] cmp r0, #0 beq _0200F1A0 - bl sub_02022974 + bl GF_AssertFail _0200F1A0: ldr r0, _0200F254 ; =0x021BF474 bl sub_0200F814 @@ -667,14 +667,14 @@ sub_0200F634: ; 0x0200F634 str r1, [sp] cmp r0, #0 beq _0200F656 - bl sub_02022974 + bl GF_AssertFail _0200F656: add r6, r5, #0 add r6, #8 ldr r0, [r6, r4] cmp r0, #0 bne _0200F664 - bl sub_02022974 + bl GF_AssertFail _0200F664: ldr r0, [r5, #0x10] cmp r0, #0 @@ -692,7 +692,7 @@ _0200F67E: ldr r0, [sp, #4] cmp r0, #1 beq _0200F688 - bl sub_02022974 + bl GF_AssertFail _0200F688: ldr r0, [sp] cmp r7, #0 diff --git a/asm/unk_0200F85C.s b/asm/unk_0200F85C.s index 9c510e6d66..0e7b5c64db 100644 --- a/asm/unk_0200F85C.s +++ b/asm/unk_0200F85C.s @@ -1367,7 +1367,7 @@ _02010274: mov r7, #0xf mvn r7, r7 mov r6, #0 - bl sub_02022974 + bl GF_AssertFail b _020102A0 _02010280: cmp r1, r0 @@ -1386,7 +1386,7 @@ _02010296: mov r7, #0 add r6, r7, #0 sub r6, #0x10 - bl sub_02022974 + bl GF_AssertFail _020102A0: ldr r0, [r5, #0x10] add r1, r7, #0 @@ -1499,7 +1499,7 @@ sub_0201035C: ; 0x0201035C push {r4, r5, r6, lr} add r4, r0, #0 bne _02010366 - bl sub_02022974 + bl GF_AssertFail _02010366: ldr r0, _02010578 ; =0x04000006 ldrh r0, [r0] @@ -1864,7 +1864,7 @@ sub_02010604: ; 0x02010604 add r4, r1, #0 cmp r0, r4 bgt _02010614 - bl sub_02022974 + bl GF_AssertFail _02010614: ldr r0, _02010620 ; =0x00000604 ldr r1, [r5, #0] @@ -2116,7 +2116,7 @@ sub_020107D8: ; 0x020107D8 push {r3, r4, r5, lr} add r4, r0, #0 bne _020107E2 - bl sub_02022974 + bl GF_AssertFail _020107E2: ldr r0, _02010AD0 ; =0x04000006 ldrh r0, [r0] @@ -3179,7 +3179,7 @@ _02010FB2: mov r6, #1 b _02010FBA _02010FB6: - bl sub_02022974 + bl GF_AssertFail _02010FBA: add r0, r6, #0 pop {r4, r5, r6, pc} @@ -3556,7 +3556,7 @@ _0201128A: mov r6, #1 b _02011292 _0201128E: - bl sub_02022974 + bl GF_AssertFail _02011292: add r0, r6, #0 pop {r4, r5, r6, pc} @@ -4013,7 +4013,7 @@ sub_020115B8: ; 0x020115B8 str r0, [sp, #4] cmp r0, #0xc0 blt _02011624 - bl sub_02022974 + bl GF_AssertFail _02011624: ldr r2, [sp, #4] add r0, r4, #0 @@ -4152,7 +4152,7 @@ _0201172C: mov r6, #1 b _02011734 _02011730: - bl sub_02022974 + bl GF_AssertFail _02011734: add r0, r6, #0 pop {r4, r5, r6, pc} @@ -4177,7 +4177,7 @@ sub_02011738: ; 0x02011738 str r0, [r6, #0xc] cmp r0, #0 bne _02011760 - bl sub_02022974 + bl GF_AssertFail _02011760: ldrh r0, [r5, #8] str r0, [r6, #0x10] @@ -4523,7 +4523,7 @@ _020119F4: mov r6, #1 b _020119FC _020119F8: - bl sub_02022974 + bl GF_AssertFail _020119FC: add r0, r6, #0 pop {r4, r5, r6, pc} @@ -4943,7 +4943,7 @@ _02011D28: mov r6, #1 b _02011D30 _02011D2C: - bl sub_02022974 + bl GF_AssertFail _02011D30: add r0, r6, #0 pop {r4, r5, r6, pc} @@ -5296,7 +5296,7 @@ _02011FDC: mov r6, #1 b _02011FE4 _02011FE0: - bl sub_02022974 + bl GF_AssertFail _02011FE4: add r0, r6, #0 pop {r4, r5, r6, pc} @@ -5662,7 +5662,7 @@ _0201227E: mov r4, #1 b _02012286 _02012282: - bl sub_02022974 + bl GF_AssertFail _02012286: add r0, r4, #0 pop {r3, r4, r5, pc} diff --git a/asm/unk_02012744.s b/asm/unk_02012744.s index c852760367..d8eee3a2a3 100644 --- a/asm/unk_02012744.s +++ b/asm/unk_02012744.s @@ -18,7 +18,7 @@ sub_02012744: ; 0x02012744 str r0, [sp, #8] cmp r0, #0 bne _0201275E - bl sub_02022974 + bl GF_AssertFail _0201275E: ldr r4, [sp, #8] ldr r5, [sp, #8] @@ -34,7 +34,7 @@ _02012766: str r0, [r5, #0] cmp r0, #0 bne _0201277E - bl sub_02022974 + bl GF_AssertFail _0201277E: add r6, r6, #1 add r4, r4, #4 @@ -52,7 +52,7 @@ _0201277E: cmp r0, #0 str r0, [r1, #0x60] bne _020127A4 - bl sub_02022974 + bl GF_AssertFail _020127A4: ldr r1, [sp, #4] ldr r0, [sp, #8] @@ -72,7 +72,7 @@ sub_020127BC: ; 0x020127BC push {r4, r5, r6, lr} add r6, r0, #0 bne _020127C6 - bl sub_02022974 + bl GF_AssertFail _020127C6: mov r4, #0 add r5, r6, #0 @@ -97,13 +97,13 @@ sub_020127E8: ; 0x020127E8 sub sp, #0x1c add r5, r0, #0 bne _020127F4 - bl sub_02022974 + bl GF_AssertFail _020127F4: ldr r0, [r5, #0] bl sub_02012CE0 add r4, r0, #0 bne _02012802 - bl sub_02022974 + bl GF_AssertFail _02012802: ldr r0, [r5, #0x10] add r3, sp, #8 @@ -160,12 +160,12 @@ sub_02012870: ; 0x02012870 push {r4, lr} add r4, r0, #0 bne _0201287A - bl sub_02022974 + bl GF_AssertFail _0201287A: ldr r0, [r4, #0] cmp r0, #0 bne _02012884 - bl sub_02022974 + bl GF_AssertFail _02012884: add r0, r4, #0 bl sub_020130DC @@ -208,7 +208,7 @@ sub_020128C4: ; 0x020128C4 str r1, [sp] cmp r5, #0 bne _020128D6 - bl sub_02022974 + bl GF_AssertFail _020128D6: ldr r0, [sp] str r0, [r5, #0xc] @@ -268,7 +268,7 @@ sub_02012938: ; 0x02012938 sub sp, #0x10 add r5, r0, #0 bne _02012944 - bl sub_02022974 + bl GF_AssertFail _02012944: ldr r0, [r5, #8] cmp r0, #0 @@ -328,15 +328,15 @@ sub_020129A4: ; 0x020129A4 add r6, r2, #0 cmp r5, #0 bne _020129B4 - bl sub_02022974 + bl GF_AssertFail _020129B4: cmp r4, #0 bne _020129BC - bl sub_02022974 + bl GF_AssertFail _020129BC: cmp r6, #0 bne _020129C4 - bl sub_02022974 + bl GF_AssertFail _020129C4: ldr r0, [r5, #0xc] str r0, [r4, #0] @@ -353,7 +353,7 @@ sub_020129D0: ; 0x020129D0 add r7, r1, #0 cmp r5, #0 bne _020129DE - bl sub_02022974 + bl GF_AssertFail _020129DE: ldr r0, [r5, #4] mov r6, #0 @@ -382,7 +382,7 @@ sub_02012A00: ; 0x02012A00 add r7, r1, #0 cmp r5, #0 bne _02012A0E - bl sub_02022974 + bl GF_AssertFail _02012A0E: ldr r0, [r5, #4] mov r6, #0 @@ -411,7 +411,7 @@ sub_02012A30: ; 0x02012A30 add r7, r1, #0 cmp r5, #0 bne _02012A3E - bl sub_02022974 + bl GF_AssertFail _02012A3E: ldr r0, [r5, #4] mov r6, #0 @@ -440,7 +440,7 @@ sub_02012A60: ; 0x02012A60 add r7, r1, #0 cmp r5, #0 bne _02012A6E - bl sub_02022974 + bl GF_AssertFail _02012A6E: ldr r0, [r5, #4] mov r6, #0 @@ -469,7 +469,7 @@ sub_02012A90: ; 0x02012A90 add r7, r1, #0 cmp r5, #0 bne _02012A9E - bl sub_02022974 + bl GF_AssertFail _02012A9E: ldr r0, [r5, #4] mov r6, #0 @@ -498,7 +498,7 @@ sub_02012AC0: ; 0x02012AC0 add r7, r1, #0 cmp r5, #0 bne _02012ACE - bl sub_02022974 + bl GF_AssertFail _02012ACE: ldr r0, [r5, #4] mov r6, #0 @@ -527,7 +527,7 @@ sub_02012AF0: ; 0x02012AF0 add r7, r1, #0 cmp r5, #0 bne _02012AFE - bl sub_02022974 + bl GF_AssertFail _02012AFE: ldr r0, [r5, #4] mov r6, #0 @@ -597,13 +597,13 @@ sub_02012B60: ; 0x02012B60 add r6, r1, #0 cmp r5, #0 bne _02012B70 - bl sub_02022974 + bl GF_AssertFail _02012B70: ldr r0, [r5, #0] bl sub_02012CE0 add r4, r0, #0 bne _02012B7E - bl sub_02022974 + bl GF_AssertFail _02012B7E: ldr r0, [r5, #0x10] mov r1, #0x24 @@ -730,7 +730,7 @@ sub_02012C60: ; 0x02012C60 str r3, [sp, #4] cmp r1, r0 bge _02012C82 - bl sub_02022974 + bl GF_AssertFail _02012C82: ldrb r2, [r6, #8] ldr r1, [sp] @@ -738,7 +738,7 @@ _02012C82: add r0, r1, r0 cmp r2, r0 bge _02012C92 - bl sub_02022974 + bl GF_AssertFail _02012C92: ldr r0, [sp] mov r4, #0 @@ -886,7 +886,7 @@ sub_02012D34: ; 0x02012D34 ldrb r0, [r0] cmp r0, #1 bne _02012D94 - bl sub_02022974 + bl GF_AssertFail _02012D94: add r0, r5, #0 mov r1, #1 @@ -942,12 +942,12 @@ sub_02012DE4: ; 0x02012DE4 add r6, r3, #0 cmp r7, #0 bne _02012DF8 - bl sub_02022974 + bl GF_AssertFail _02012DF8: ldr r0, [sp] cmp r0, #0 bne _02012E02 - bl sub_02022974 + bl GF_AssertFail _02012E02: ldr r0, [sp] mov r4, #0 @@ -1311,7 +1311,7 @@ _0201309E: ldr r0, [r0, r5] cmp r0, #0 bne _020130B8 - bl sub_02022974 + bl GF_AssertFail _020130B8: ldr r0, [r4, #0] add r7, #0x24 @@ -1435,7 +1435,7 @@ sub_02013188: ; 0x02013188 bl sub_02018184 add r4, r0, #0 bne _02013198 - bl sub_02022974 + bl GF_AssertFail _02013198: mov r0, #0 str r0, [r4, #0xc] @@ -1450,7 +1450,7 @@ sub_020131A4: ; 0x020131A4 push {r4, lr} add r4, r0, #0 bne _020131AE - bl sub_02022974 + bl GF_AssertFail _020131AE: add r0, r4, #0 bl sub_020181C4 diff --git a/asm/unk_020131EC.s b/asm/unk_020131EC.s index af3c4fa012..21c0cffcef 100644 --- a/asm/unk_020131EC.s +++ b/asm/unk_020131EC.s @@ -49,7 +49,7 @@ sub_0201322C: ; 0x0201322C bl sub_02006AC0 add r4, r0, #0 bne _0201323C - bl sub_02022974 + bl GF_AssertFail _0201323C: add r0, r4, #0 add r1, r5, #0 @@ -57,11 +57,11 @@ _0201323C: add r6, r0, #0 cmp r5, #0 bne _0201324E - bl sub_02022974 + bl GF_AssertFail _0201324E: cmp r6, #0 bne _02013256 - bl sub_02022974 + bl GF_AssertFail _02013256: add r0, r4, #0 bl sub_020181C4 @@ -81,7 +81,7 @@ sub_02013260: ; 0x02013260 add r5, r3, #0 cmp r0, r6 bge _02013278 - bl sub_02022974 + bl GF_AssertFail _02013278: ldr r0, [sp, #0xc] ldrh r1, [r4] @@ -89,7 +89,7 @@ _02013278: str r0, [sp, #0x14] cmp r1, r0 bge _02013288 - bl sub_02022974 + bl GF_AssertFail _02013288: ldr r0, [r4, #0x14] str r0, [sp, #0x20] @@ -284,14 +284,14 @@ sub_020133D4: ; 0x020133D4 str r0, [sp, #0x20] cmp r0, #0 bne _020133F2 - bl sub_02022974 + bl GF_AssertFail _020133F2: ldr r0, [sp, #0x20] add r1, sp, #0x2c bl NNS_G2dGetUnpackedCharacterData cmp r0, #0 bne _02013402 - bl sub_02022974 + bl GF_AssertFail _02013402: ldr r1, [sp, #0x4c] ldr r0, [sp, #8] @@ -300,7 +300,7 @@ _02013402: ldrh r0, [r0, #2] cmp r0, r6 bge _02013414 - bl sub_02022974 + bl GF_AssertFail _02013414: ldr r1, [sp, #0x50] ldr r0, [sp, #0x48] @@ -311,7 +311,7 @@ _02013414: ldr r0, [sp, #0x10] cmp r1, r0 bge _0201342A - bl sub_02022974 + bl GF_AssertFail _0201342A: ldr r0, [sp, #0x2c] add r1, r4, #0 @@ -640,7 +640,7 @@ sub_02013660: ; 0x02013660 bl NNS_G2dGetUnpackedPaletteData cmp r0, #1 beq _0201368C - bl sub_02022974 + bl GF_AssertFail _0201368C: ldr r0, [sp] add r1, r4, #0 diff --git a/asm/unk_0201378C.s b/asm/unk_0201378C.s index 46162453ff..e4a4749ab9 100644 --- a/asm/unk_0201378C.s +++ b/asm/unk_0201378C.s @@ -65,7 +65,7 @@ sub_020137EC: ; 0x020137EC str r0, [r4, #0xc] cmp r0, #0 beq _020137FA - bl sub_02022974 + bl GF_AssertFail _020137FA: add r3, r4, #0 mov r0, #1 @@ -106,7 +106,7 @@ sub_02013824: ; 0x02013824 str r0, [r4, #0xc] cmp r0, #0 beq _02013846 - bl sub_02022974 + bl GF_AssertFail _02013846: pop {r4, pc} ; .align 2, 0 @@ -122,7 +122,7 @@ sub_0201384C: ; 0x0201384C ldr r0, [r0, #0] cmp r0, #1 beq _0201385E - bl sub_02022974 + bl GF_AssertFail _0201385E: ldr r2, _02013878 ; =0x021BF5D8 ldmia r2!, {r0, r1} @@ -149,7 +149,7 @@ sub_02013880: ; 0x02013880 ldr r0, [r0, #0] cmp r0, #1 beq _02013890 - bl sub_02022974 + bl GF_AssertFail _02013890: ldr r2, _020138A0 ; =0x021BF5E8 ldmia r2!, {r0, r1} @@ -170,7 +170,7 @@ sub_020138A4: ; 0x020138A4 ldr r0, [r0, #0] cmp r0, #1 beq _020138B4 - bl sub_02022974 + bl GF_AssertFail _020138B4: ldr r2, _020138C4 ; =0x021BF5D8 ldmia r2!, {r0, r1} @@ -293,7 +293,7 @@ sub_02013974: ; 0x02013974 cmp r4, #0x18 blt _02013982 _0201397E: - bl sub_02022974 + bl GF_AssertFail _02013982: ldr r0, _02013988 ; =0x020E5418 ldrb r0, [r0, r4] @@ -335,7 +335,7 @@ sub_0201398C: ; 0x0201398C eor r0, r3 orr r0, r1 beq _020139D0 - bl sub_02022974 + bl GF_AssertFail _020139D0: sub r0, r4, r5 mov ip, r7 diff --git a/asm/unk_02013A04.s b/asm/unk_02013A04.s index 2c616b435e..a0aa43d638 100644 --- a/asm/unk_02013A04.s +++ b/asm/unk_02013A04.s @@ -119,7 +119,7 @@ sub_02013AAC: ; 0x02013AAC _02013AB8: cmp r3, r2 bne _02013AC4 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} _02013AC4: diff --git a/asm/unk_02013B10.s b/asm/unk_02013B10.s index 5fa3a52a6b..aeb99ddde9 100644 --- a/asm/unk_02013B10.s +++ b/asm/unk_02013B10.s @@ -38,7 +38,7 @@ sub_02013B40: ; 0x02013B40 push {r4, lr} add r4, r0, #0 bne _02013B4A - bl sub_02022974 + bl GF_AssertFail _02013B4A: add r0, r4, #0 bl sub_020181C4 @@ -51,7 +51,7 @@ sub_02013B54: ; 0x02013B54 push {r4, lr} add r4, r0, #0 bne _02013B5E - bl sub_02022974 + bl GF_AssertFail _02013B5E: ldrb r0, [r4, #8] lsl r0, r0, #2 @@ -65,7 +65,7 @@ sub_02013B68: ; 0x02013B68 push {r4, lr} add r4, r0, #0 bne _02013B72 - bl sub_02022974 + bl GF_AssertFail _02013B72: ldrb r1, [r4, #8] mov r0, #1 @@ -83,7 +83,7 @@ sub_02013B80: ; 0x02013B80 add r4, r1, #0 cmp r5, #0 bne _02013B8E - bl sub_02022974 + bl GF_AssertFail _02013B8E: strb r4, [r5, #9] pop {r3, r4, r5, pc} @@ -172,13 +172,13 @@ sub_02013C10: ; 0x02013C10 add r7, r3, #0 cmp r5, #0 bne _02013C22 - bl sub_02022974 + bl GF_AssertFail _02013C22: ldr r0, _02013C90 ; =0x00000604 ldr r0, [r5, r0] cmp r0, #0 beq _02013C2E - bl sub_02022974 + bl GF_AssertFail _02013C2E: ldr r0, _02013C94 ; =0x0000078C mov r2, #0 @@ -242,13 +242,13 @@ sub_02013CA4: ; 0x02013CA4 add r7, r3, #0 cmp r5, #0 bne _02013CB6 - bl sub_02022974 + bl GF_AssertFail _02013CB6: ldr r0, _02013D24 ; =0x00000604 ldr r0, [r5, r0] cmp r0, #0 beq _02013CC2 - bl sub_02022974 + bl GF_AssertFail _02013CC2: ldr r0, _02013D28 ; =0x0000078C mov r2, #0 @@ -308,7 +308,7 @@ sub_02013D38: ; 0x02013D38 push {r4, lr} add r4, r0, #0 bne _02013D42 - bl sub_02022974 + bl GF_AssertFail _02013D42: ldr r0, _02013D6C ; =0x00000604 ldr r0, [r4, r0] @@ -652,7 +652,7 @@ sub_02013FD0: ; 0x02013FD0 push {r3, r4, r5, lr} add r4, r0, #0 bne _02013FDA - bl sub_02022974 + bl GF_AssertFail _02013FDA: mov r0, #6 lsl r0, r0, #8 diff --git a/asm/unk_02014000.s b/asm/unk_02014000.s index a3d3bfd877..81feaa2a8e 100644 --- a/asm/unk_02014000.s +++ b/asm/unk_02014000.s @@ -51,7 +51,7 @@ _0201403C: bl sub_02018144 add r4, r0, #0 bne _0201404C - bl sub_02022974 + bl GF_AssertFail _0201404C: add r0, r4, #0 mov r1, #0 @@ -295,7 +295,7 @@ _0201421C: ldr r1, [r1, #0x14] cmp r0, r1 blo _02014228 - bl sub_02022974 + bl GF_AssertFail _02014228: add r0, r4, #0 pop {r4, pc} @@ -322,7 +322,7 @@ _02014248: ldr r1, [r1, #0x14] cmp r0, r1 blo _02014254 - bl sub_02022974 + bl GF_AssertFail _02014254: add r0, r4, #0 pop {r4, pc} @@ -349,7 +349,7 @@ _02014274: ldr r1, [r1, #0x14] cmp r0, r1 blo _02014280 - bl sub_02022974 + bl GF_AssertFail _02014280: add r0, r4, #0 pop {r4, pc} @@ -376,7 +376,7 @@ _020142A0: ldr r1, [r1, #0x14] cmp r0, r1 blo _020142AC - bl sub_02022974 + bl GF_AssertFail _020142AC: add r0, r4, #0 pop {r4, pc} @@ -403,7 +403,7 @@ _020142CC: ldr r1, [r1, #0x14] cmp r0, r1 blo _020142D8 - bl sub_02022974 + bl GF_AssertFail _020142D8: add r0, r4, #0 pop {r4, pc} @@ -430,7 +430,7 @@ _020142F8: ldr r1, [r1, #0x14] cmp r0, r1 blo _02014304 - bl sub_02022974 + bl GF_AssertFail _02014304: add r0, r4, #0 pop {r4, pc} @@ -457,7 +457,7 @@ _02014324: ldr r1, [r1, #0x14] cmp r0, r1 blo _02014330 - bl sub_02022974 + bl GF_AssertFail _02014330: add r0, r4, #0 pop {r4, pc} @@ -484,7 +484,7 @@ _02014350: ldr r1, [r1, #0x14] cmp r0, r1 blo _0201435C - bl sub_02022974 + bl GF_AssertFail _0201435C: add r0, r4, #0 pop {r4, pc} @@ -511,7 +511,7 @@ _0201437C: ldr r1, [r1, #0x14] cmp r0, r1 blo _02014388 - bl sub_02022974 + bl GF_AssertFail _02014388: add r0, r4, #0 pop {r4, pc} @@ -538,7 +538,7 @@ _020143A8: ldr r1, [r1, #0x14] cmp r0, r1 blo _020143B4 - bl sub_02022974 + bl GF_AssertFail _020143B4: add r0, r4, #0 pop {r4, pc} @@ -565,7 +565,7 @@ _020143D4: ldr r1, [r1, #0x14] cmp r0, r1 blo _020143E0 - bl sub_02022974 + bl GF_AssertFail _020143E0: add r0, r4, #0 pop {r4, pc} @@ -592,7 +592,7 @@ _02014400: ldr r1, [r1, #0x14] cmp r0, r1 blo _0201440C - bl sub_02022974 + bl GF_AssertFail _0201440C: add r0, r4, #0 pop {r4, pc} @@ -619,7 +619,7 @@ _0201442C: ldr r1, [r1, #0x14] cmp r0, r1 blo _02014438 - bl sub_02022974 + bl GF_AssertFail _02014438: add r0, r4, #0 pop {r4, pc} @@ -646,7 +646,7 @@ _02014458: ldr r1, [r1, #0x14] cmp r0, r1 blo _02014464 - bl sub_02022974 + bl GF_AssertFail _02014464: add r0, r4, #0 pop {r4, pc} @@ -673,7 +673,7 @@ _02014484: ldr r1, [r1, #0x14] cmp r0, r1 blo _02014490 - bl sub_02022974 + bl GF_AssertFail _02014490: add r0, r4, #0 pop {r4, pc} @@ -700,7 +700,7 @@ _020144B0: ldr r1, [r1, #0x14] cmp r0, r1 blo _020144BC - bl sub_02022974 + bl GF_AssertFail _020144BC: add r0, r4, #0 pop {r4, pc} @@ -726,12 +726,12 @@ sub_020144CC: ; 0x020144CC add r7, r3, #0 cmp r0, #0 bne _020144E0 - bl sub_02022974 + bl GF_AssertFail _020144E0: ldr r0, [r5, #4] cmp r0, #0 beq _020144EA - bl sub_02022974 + bl GF_AssertFail _020144EA: add r0, r5, #0 add r0, #0xd8 @@ -848,13 +848,13 @@ sub_020145B4: ; 0x020145B4 push {r4, lr} add r4, r0, #0 bne _020145BE - bl sub_02022974 + bl GF_AssertFail _020145BE: ldr r0, _020145F0 ; =0x021BF610 ldr r0, [r0, #0] cmp r0, #0 bne _020145CA - bl sub_02022974 + bl GF_AssertFail _020145CA: ldr r0, _020145F0 ; =0x021BF610 mov r1, #0 @@ -873,7 +873,7 @@ _020145E0: add r2, r2, #4 cmp r1, #0x10 blt _020145D2 - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} nop _020145F0: .word 0x021BF610 @@ -884,13 +884,13 @@ sub_020145F4: ; 0x020145F4 push {r4, lr} add r4, r0, #0 bne _020145FE - bl sub_02022974 + bl GF_AssertFail _020145FE: ldr r0, _02014634 ; =0x021BF610 ldr r0, [r0, #0] cmp r0, #0 bne _0201460A - bl sub_02022974 + bl GF_AssertFail _0201460A: ldr r0, _02014634 ; =0x021BF610 mov r1, #0 @@ -912,7 +912,7 @@ _02014626: add r2, r2, #4 cmp r1, #0x10 blt _02014612 - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} ; .align 2, 0 _02014634: .word 0x021BF610 diff --git a/asm/unk_020149F0.s b/asm/unk_020149F0.s index 161eceeeb5..a51d3c412a 100644 --- a/asm/unk_020149F0.s +++ b/asm/unk_020149F0.s @@ -35,7 +35,7 @@ sub_02014A20: ; 0x02014A20 push {r4, lr} add r4, r0, #0 bne _02014A2A - bl sub_02022974 + bl GF_AssertFail _02014A2A: cmp r4, #0 beq _02014A3E @@ -57,7 +57,7 @@ sub_02014A40: ; 0x02014A40 add r4, r1, #0 cmp r5, #0 bne _02014A4E - bl sub_02022974 + bl GF_AssertFail _02014A4E: cmp r5, #0 beq _02014A54 diff --git a/asm/unk_02014A84.s b/asm/unk_02014A84.s index 469163afd9..8d2a2640d4 100644 --- a/asm/unk_02014A84.s +++ b/asm/unk_02014A84.s @@ -57,7 +57,7 @@ sub_02014AC4: ; 0x02014AC4 add r5, r0, #0 cmp r6, #4 blo _02014AD2 - bl sub_02022974 + bl GF_AssertFail _02014AD2: cmp r6, #4 bhs _02014B18 @@ -224,13 +224,13 @@ sub_02014C00: ; 0x02014C00 add r4, r1, #0 cmp r5, #5 blo _02014C0E - bl sub_02022974 + bl GF_AssertFail _02014C0E: add r0, r5, #0 bl sub_02014CD4 cmp r4, r0 blo _02014C1C - bl sub_02022974 + bl GF_AssertFail _02014C1C: ldr r1, _02014C70 ; =0x020E5498 lsl r2, r5, #1 @@ -367,7 +367,7 @@ sub_02014CE0: ; 0x02014CE0 add r6, r2, #0 cmp r4, #5 blo _02014CF0 - bl sub_02022974 + bl GF_AssertFail _02014CF0: strh r4, [r5] strh r6, [r5, #2] @@ -383,7 +383,7 @@ sub_02014CF8: ; 0x02014CF8 add r6, r2, #0 cmp r4, #2 blo _02014D08 - bl sub_02022974 + bl GF_AssertFail _02014D08: lsl r0, r4, #1 add r0, r5, r0 diff --git a/asm/unk_02014D38.s b/asm/unk_02014D38.s index 375af71d16..2fb109f2ac 100644 --- a/asm/unk_02014D38.s +++ b/asm/unk_02014D38.s @@ -434,7 +434,7 @@ sub_02015008: ; 0x02015008 add r4, r1, #0 cmp r5, #0 bne _02015016 - bl sub_02022974 + bl GF_AssertFail _02015016: ldr r0, [r5, #0] cmp r0, r4 @@ -459,7 +459,7 @@ sub_02015030: ; 0x02015030 add r4, r1, #0 cmp r5, #0 bne _0201503E - bl sub_02022974 + bl GF_AssertFail _0201503E: ldr r3, [r5, #0] mov r1, #0 diff --git a/asm/unk_02015064.s b/asm/unk_02015064.s index b80306b472..6d4795e2fc 100644 --- a/asm/unk_02015064.s +++ b/asm/unk_02015064.s @@ -15,7 +15,7 @@ sub_02015064: ; 0x02015064 bl sub_02018144 add r4, r0, #0 bne _02015078 - bl sub_02022974 + bl GF_AssertFail _02015078: ldr r0, [r5, #0] ldr r1, [r5, #0xc] @@ -45,22 +45,22 @@ sub_020150A8: ; 0x020150A8 push {r4, lr} add r4, r0, #0 bne _020150B2 - bl sub_02022974 + bl GF_AssertFail _020150B2: ldr r0, [r4, #0] cmp r0, #0 bne _020150BC - bl sub_02022974 + bl GF_AssertFail _020150BC: ldr r0, [r4, #8] cmp r0, #0 bne _020150C6 - bl sub_02022974 + bl GF_AssertFail _020150C6: ldr r0, [r4, #0x10] cmp r0, #0 bne _020150D0 - bl sub_02022974 + bl GF_AssertFail _020150D0: ldr r0, [r4, #0] bl sub_020181C4 @@ -116,20 +116,20 @@ sub_02015128: ; 0x02015128 bl sub_020153B4 add r4, r0, #0 bne _0201513A - bl sub_02022974 + bl GF_AssertFail _0201513A: ldr r0, [r5, #4] ldr r0, [r0, #8] cmp r0, #0 beq _02015146 - bl sub_02022974 + bl GF_AssertFail _02015146: ldr r0, [r5, #4] bl sub_0201540C str r0, [r4, #0] cmp r0, #0 bne _02015156 - bl sub_02022974 + bl GF_AssertFail _02015156: ldr r0, [r5, #4] ldr r1, [r4, #0] @@ -188,14 +188,14 @@ sub_020151A4: ; 0x020151A4 bl sub_020153E0 add r4, r0, #0 bne _020151B6 - bl sub_02022974 + bl GF_AssertFail _020151B6: ldr r0, [r5, #8] bl sub_02015420 str r0, [r4, #0] cmp r0, #0 bne _020151C6 - bl sub_02022974 + bl GF_AssertFail _020151C6: ldr r0, [r5, #4] ldr r1, [r4, #0] @@ -254,7 +254,7 @@ sub_02015214: ; 0x02015214 bl sub_02015388 add r4, r0, #0 bne _02015226 - bl sub_02022974 + bl GF_AssertFail _02015226: add r0, r4, #0 add r1, r5, #0 @@ -281,7 +281,7 @@ sub_02015240: ; 0x02015240 add r4, r1, #0 cmp r5, #0 bne _0201524E - bl sub_02022974 + bl GF_AssertFail _0201524E: str r4, [r5, #0x20] pop {r3, r4, r5, pc} @@ -454,7 +454,7 @@ sub_020152F8: ; 0x020152F8 bl sub_02018144 add r7, r0, #0 bne _0201530C - bl sub_02022974 + bl GF_AssertFail _0201530C: mov r4, #0 cmp r6, #0 @@ -483,7 +483,7 @@ sub_02015328: ; 0x02015328 bl sub_02018144 add r7, r0, #0 bne _0201533E - bl sub_02022974 + bl GF_AssertFail _0201533E: mov r4, #0 cmp r6, #0 @@ -511,7 +511,7 @@ sub_02015358: ; 0x02015358 bl sub_02018144 add r7, r0, #0 bne _0201536E - bl sub_02022974 + bl GF_AssertFail _0201536E: mov r4, #0 cmp r6, #0 diff --git a/asm/unk_02015920.s b/asm/unk_02015920.s index b175565555..03627812ae 100644 --- a/asm/unk_02015920.s +++ b/asm/unk_02015920.s @@ -136,7 +136,7 @@ sub_020159FC: ; 0x020159FC lsr r0, r0, #0x1c cmp r0, #1 beq _02015A10 - bl sub_02022974 + bl GF_AssertFail _02015A10: add r0, r4, #0 add r0, #0x9a diff --git a/asm/unk_02015F84.s b/asm/unk_02015F84.s index 10e77c34db..92bbc173a1 100644 --- a/asm/unk_02015F84.s +++ b/asm/unk_02015F84.s @@ -61,7 +61,7 @@ sub_02015FCC: ; 0x02015FCC str r2, [sp] cmp r0, r1 blo _02015FEC - bl sub_02022974 + bl GF_AssertFail _02015FEC: ldr r0, [sp, #4] mov r1, #0x1d @@ -73,7 +73,7 @@ _02015FEC: ldr r0, [r0, #0x10] cmp r0, #0 beq _02016004 - bl sub_02022974 + bl GF_AssertFail _02016004: ldr r0, [r5, #0] mov r2, #0x1d @@ -202,7 +202,7 @@ sub_020160F4: ; 0x020160F4 add r4, r1, #0 cmp r4, r0 blo _02016104 - bl sub_02022974 + bl GF_AssertFail _02016104: mov r0, #0x1d lsl r0, r0, #4 @@ -365,7 +365,7 @@ _02016218: ldr r0, [r0, #0] cmp r0, #0x22 blo _0201622A - bl sub_02022974 + bl GF_AssertFail _0201622A: ldr r1, [r5, #0xc] add r0, r5, #0 @@ -397,7 +397,7 @@ _0201625E: lsl r0, r0, #8 cmp r1, r0 blt _02016218 - bl sub_02022974 + bl GF_AssertFail mov r0, #1 str r0, [r5, #0x1c] _02016270: @@ -415,7 +415,7 @@ sub_02016280: ; 0x02016280 ldr r4, [r0, r1] cmp r2, #1 beq _0201628E - bl sub_02022974 + bl GF_AssertFail _0201628E: add r0, r4, #0 pop {r4, pc} @@ -475,7 +475,7 @@ _020162E0: lsr r3, r1, #0x18 cmp r3, #4 blo _020162B6 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} nop @@ -521,7 +521,7 @@ sub_02016320: ; 0x02016320 ldrb r0, [r4] cmp r0, #8 blo _0201633C - bl sub_02022974 + bl GF_AssertFail _0201633C: pop {r4, pc} ; .align 2, 0 @@ -592,7 +592,7 @@ _02016394: str r0, [r6, #0] pop {r3, r4, r5, r6, pc} _020163C0: - bl sub_02022974 + bl GF_AssertFail add sp, #4 pop {r3, r4, r5, r6, pc} thumb_func_end sub_02016354 @@ -635,7 +635,7 @@ _020163FA: str r0, [r4, #0] b _0201641A _02016416: - bl sub_02022974 + bl GF_AssertFail _0201641A: add r0, sp, #0 ldrb r0, [r0] @@ -662,7 +662,7 @@ _0201642E: str r0, [r6, #0] pop {r3, r4, r5, r6, pc} _0201644C: - bl sub_02022974 + bl GF_AssertFail add sp, #4 pop {r3, r4, r5, r6, pc} thumb_func_end sub_020163C8 @@ -708,7 +708,7 @@ _0201648A: str r0, [r6, #0] b _020164AA _020164A6: - bl sub_02022974 + bl GF_AssertFail _020164AA: add r0, r5, #0 add r1, sp, #0 @@ -736,7 +736,7 @@ _020164C4: str r0, [sp, #4] b _020164E4 _020164E0: - bl sub_02022974 + bl GF_AssertFail _020164E4: ldr r0, [sp, #4] add r0, r7, r0 @@ -1019,7 +1019,7 @@ _020166AC: str r0, [sp, #8] b _020166DA _020166D6: - bl sub_02022974 + bl GF_AssertFail _020166DA: add r1, sp, #0 add r0, r5, #0 @@ -1029,7 +1029,7 @@ _020166DA: ldrb r0, [r0, #1] cmp r0, #0x11 bls _020166F0 - bl sub_02022974 + bl GF_AssertFail _020166F0: add r0, sp, #0xc add r1, sp, #8 @@ -1067,7 +1067,7 @@ _0201671E: str r0, [sp, #4] b _02016742 _0201673E: - bl sub_02022974 + bl GF_AssertFail _02016742: add r0, sp, #0 ldrb r1, [r0, #1] @@ -1110,7 +1110,7 @@ sub_0201677C: ; 0x0201677C ldr r0, [r4, #0x50] cmp r0, #0 beq _0201678A - bl sub_02022974 + bl GF_AssertFail _0201678A: ldr r0, [r4, #0xc] add r0, r0, #4 @@ -1223,7 +1223,7 @@ _0201683C: str r0, [sp, #4] b _0201685C _02016858: - bl sub_02022974 + bl GF_AssertFail _0201685C: add r0, r4, #0 add r1, sp, #0 @@ -1248,7 +1248,7 @@ _0201687A: add sp, #0xc pop {r3, r4, pc} _0201688C: - bl sub_02022974 + bl GF_AssertFail add sp, #0xc pop {r3, r4, pc} thumb_func_end sub_02016814 @@ -1344,7 +1344,7 @@ _0201692C: str r0, [r4, #0x64] pop {r3, r4, pc} _0201693E: - bl sub_02022974 + bl GF_AssertFail add sp, #4 pop {r3, r4, pc} ; .align 2, 0 @@ -1387,7 +1387,7 @@ _02016978: str r0, [r4, #0x64] pop {r3, r4, pc} _0201698E: - bl sub_02022974 + bl GF_AssertFail add sp, #4 pop {r3, r4, pc} ; .align 2, 0 @@ -1445,7 +1445,7 @@ _020169E6: add r4, #0x78 b _020169F4 _020169F0: - bl sub_02022974 + bl GF_AssertFail _020169F4: add r1, sp, #0 add r0, r5, #0 @@ -1474,7 +1474,7 @@ _02016A10: str r0, [sp, #4] b _02016A30 _02016A2C: - bl sub_02022974 + bl GF_AssertFail _02016A30: add r0, r5, #0 add r1, sp, #0 @@ -1497,7 +1497,7 @@ _02016A48: str r0, [r4, #0] pop {r3, r4, r5, pc} _02016A58: - bl sub_02022974 + bl GF_AssertFail add sp, #8 pop {r3, r4, r5, pc} thumb_func_end sub_02016998 @@ -1587,7 +1587,7 @@ _02016AF0: _02016B02: cmp r0, #0x1c beq _02016B0A - bl sub_02022974 + bl GF_AssertFail _02016B0A: pop {r4, pc} ; .align 2, 0 @@ -1635,7 +1635,7 @@ _02016B4A: str r0, [r4, #0x6c] pop {r3, r4, pc} _02016B5A: - bl sub_02022974 + bl GF_AssertFail add sp, #4 pop {r3, r4, pc} ; .align 2, 0 @@ -1738,7 +1738,7 @@ _02016BFE: _02016C08: cmp r1, #0 bne _02016C10 - bl sub_02022974 + bl GF_AssertFail _02016C10: pop {r4, pc} nop @@ -1815,7 +1815,7 @@ _02016C6E: str r0, [r3, #0] pop {r3, pc} _02016C7C: - bl sub_02022974 + bl GF_AssertFail pop {r3, pc} ; .align 2, 0 thumb_func_end sub_02016C54 @@ -1889,7 +1889,7 @@ _02016CEA: str r0, [r1, #0x30] pop {r3, pc} _02016CFC: - bl sub_02022974 + bl GF_AssertFail pop {r3, pc} ; .align 2, 0 thumb_func_end sub_02016C84 @@ -2056,7 +2056,7 @@ _02016E1E: str r1, [r0, #0] b _02016E3C _02016E38: - bl sub_02022974 + bl GF_AssertFail _02016E3C: add r0, r4, #0 add r0, #0x2c @@ -2160,7 +2160,7 @@ _02016EDC: str r1, [r0, #0] b _02016EFA _02016EF6: - bl sub_02022974 + bl GF_AssertFail _02016EFA: add r0, r4, #0 add r0, #0x2c @@ -2320,7 +2320,7 @@ _02017008: str r0, [r4, #0] b _0201701C _02017018: - bl sub_02022974 + bl GF_AssertFail _0201701C: add r0, r4, #0 add r0, #0x2c diff --git a/asm/unk_02017038.s b/asm/unk_02017038.s index 2fe4b8549b..7cc089ac6e 100644 --- a/asm/unk_02017038.s +++ b/asm/unk_02017038.s @@ -48,7 +48,7 @@ sub_02017070: ; 0x02017070 add r4, r1, #0 cmp r5, #3 blt _0201707E - bl sub_02022974 + bl GF_AssertFail _0201707E: ldr r0, _02017088 ; =0x020E565C lsl r1, r5, #1 diff --git a/asm/unk_020170BC.s b/asm/unk_020170BC.s index c71a6820a3..765cc4bc2e 100644 --- a/asm/unk_020170BC.s +++ b/asm/unk_020170BC.s @@ -488,7 +488,7 @@ sub_020173CC: ; 0x020173CC ldr r0, [r4, #0] cmp r0, #0 bne _020173DA - bl sub_02022974 + bl GF_AssertFail _020173DA: ldr r0, [r4, #0] bl NNS_G3dGetMdlSet diff --git a/asm/unk_02017728.s b/asm/unk_02017728.s index 551c7b3a8b..8dc311df97 100644 --- a/asm/unk_02017728.s +++ b/asm/unk_02017728.s @@ -306,7 +306,7 @@ sub_0201789C: ; 0x0201789C bl OS_AllocFromArenaLo add r5, r0, #0 bne _02017990 - bl sub_02022974 + bl GF_AssertFail _02017990: add r0, r5, #0 add r1, r4, #0 @@ -915,7 +915,7 @@ sub_02017E00: ; 0x02017E00 ldr r0, [r0, #0x70] cmp r0, #0 beq _02017E10 - bl sub_02022974 + bl GF_AssertFail _02017E10: add r0, r4, #0 mov r1, #4 @@ -937,7 +937,7 @@ sub_02017E2C: ; 0x02017E2C ldr r0, [r0, #0x70] cmp r0, #0 bne _02017E3A - bl sub_02022974 + bl GF_AssertFail _02017E3A: ldr r0, _02017E50 ; =0x021BF67C mov r2, #0 diff --git a/asm/unk_02017E74.s b/asm/unk_02017E74.s index 2724828f22..61d3c425bb 100644 --- a/asm/unk_02017E74.s +++ b/asm/unk_02017E74.s @@ -111,7 +111,7 @@ _02017F1E: strb r7, [r0, r7] b _02017F3E _02017F3A: - bl sub_02022974 + bl GF_AssertFail _02017F3E: ldr r0, [sp] add r7, r7, #1 @@ -226,7 +226,7 @@ sub_02017FE0: ; 0x02017FE0 bl OS_GetProcMode cmp r0, #0x12 bne _02017FF8 - bl sub_02022974 + bl GF_AssertFail _02017FF8: ldr r1, _02018078 ; =0x021BFAF0 ldr r0, [r1, #0x10] @@ -273,19 +273,19 @@ _02017FF8: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _02018056: - bl sub_02022974 + bl GF_AssertFail b _02018072 _0201805C: - bl sub_02022974 + bl GF_AssertFail b _02018072 _02018062: - bl sub_02022974 + bl GF_AssertFail b _02018072 _02018068: - bl sub_02022974 + bl GF_AssertFail b _02018072 _0201806E: - bl sub_02022974 + bl GF_AssertFail _02018072: mov r0, #0 add sp, #8 @@ -301,7 +301,7 @@ sub_0201807C: ; 0x0201807C bl OS_GetProcMode cmp r0, #0x12 bne _0201808C - bl sub_02022974 + bl GF_AssertFail _0201808C: ldr r0, _020180EC ; =0x021BFAF0 ldr r1, [r0, #0] @@ -327,7 +327,7 @@ _0201808C: bl NNS_FndFreeToExpHeap b _020180C2 _020180BE: - bl sub_02022974 + bl GF_AssertFail _020180C2: ldr r1, _020180EC ; =0x021BFAF0 mov r0, #0 @@ -364,7 +364,7 @@ sub_020180F0: ; 0x020180F0 add r6, r3, #0 cmp r5, #0 bne _02018102 - bl sub_02022974 + bl GF_AssertFail _02018102: bl OS_DisableInterrupts add r4, #0x10 @@ -495,7 +495,7 @@ sub_020181C4: ; 0x020181C4 ldr r7, [r1, r0] cmp r7, #0 bne _020181EA - bl sub_02022974 + bl GF_AssertFail _020181EA: ldr r0, _02018234 ; =0x021BFAF0 lsl r5, r4, #1 @@ -511,7 +511,7 @@ _020181FC: ldrh r0, [r0, r5] cmp r0, #0 bne _0201820A - bl sub_02022974 + bl GF_AssertFail _0201820A: ldr r0, _02018234 ; =0x021BFAF0 ldr r1, [r0, #0xc] @@ -528,7 +528,7 @@ _0201820A: bl OS_RestoreInterrupts pop {r3, r4, r5, r6, r7, pc} _0201822C: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} nop _02018234: .word 0x021BFAF0 @@ -542,7 +542,7 @@ sub_02018238: ; 0x02018238 bl OS_GetProcMode cmp r0, #0x12 bne _0201824A - bl sub_02022974 + bl GF_AssertFail _0201824A: ldr r0, _020182A0 ; =0x021BFAF0 ldrh r1, [r0, #0x14] @@ -555,7 +555,7 @@ _0201824A: ldr r6, [r1, r0] cmp r6, #0 bne _02018264 - bl sub_02022974 + bl GF_AssertFail _02018264: sub r0, r4, #4 ldr r0, [r0, #0] @@ -563,7 +563,7 @@ _02018264: lsr r0, r0, #0x18 cmp r0, r5 beq _02018274 - bl sub_02022974 + bl GF_AssertFail _02018274: sub r4, #0x10 add r0, r6, #0 @@ -575,7 +575,7 @@ _02018274: ldrh r0, [r0, r4] cmp r0, #0 bne _0201828E - bl sub_02022974 + bl GF_AssertFail _0201828E: ldr r0, _020182A0 ; =0x021BFAF0 ldr r1, [r0, #0xc] @@ -584,7 +584,7 @@ _0201828E: strh r0, [r1, r4] pop {r4, r5, r6, pc} _0201829A: - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} ; .align 2, 0 _020182A0: .word 0x021BFAF0 @@ -605,7 +605,7 @@ sub_020182A4: ; 0x020182A4 bl NNS_FndGetTotalFreeSizeForExpHeap pop {r3, pc} _020182BE: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} nop @@ -627,7 +627,7 @@ sub_020182CC: ; 0x020182CC bl NNS_FndInitAllocatorForExpHeap pop {r4, pc} _020182E6: - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} ; .align 2, 0 _020182EC: .word 0x021BFAF0 @@ -641,7 +641,7 @@ sub_020182F0: ; 0x020182F0 bl OS_GetProcMode cmp r0, #0x12 bne _02018302 - bl sub_02022974 + bl GF_AssertFail _02018302: add r0, r5, #0 sub r0, #0x10 @@ -665,7 +665,7 @@ _02018302: bl NNS_FndResizeForMBlockExpHeap pop {r3, r4, r5, pc} _02018330: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} nop _02018338: .word 0x021BFAF0 diff --git a/asm/unk_02018340.s b/asm/unk_02018340.s index 71ba21c4dc..717849855b 100644 --- a/asm/unk_02018340.s +++ b/asm/unk_02018340.s @@ -5295,17 +5295,17 @@ sub_0201A954: ; 0x0201A954 push {r4, lr} add r4, r0, #0 bne _0201A95E - bl sub_02022974 + bl GF_AssertFail _0201A95E: ldr r0, [r4, #0] cmp r0, #0 bne _0201A968 - bl sub_02022974 + bl GF_AssertFail _0201A968: ldrb r0, [r4, #4] cmp r0, #8 blo _0201A972 - bl sub_02022974 + bl GF_AssertFail _0201A972: ldrb r1, [r4, #4] mov r0, #0x2c @@ -5315,7 +5315,7 @@ _0201A972: ldrb r0, [r0, #0x1c] cmp r0, #3 blo _0201A986 - bl sub_02022974 + bl GF_AssertFail _0201A986: ldrb r2, [r4, #4] mov r1, #0x2c @@ -5338,17 +5338,17 @@ sub_0201A9A4: ; 0x0201A9A4 push {r4, lr} add r4, r0, #0 bne _0201A9AE - bl sub_02022974 + bl GF_AssertFail _0201A9AE: ldr r0, [r4, #0] cmp r0, #0 bne _0201A9B8 - bl sub_02022974 + bl GF_AssertFail _0201A9B8: ldrb r0, [r4, #4] cmp r0, #8 blo _0201A9C2 - bl sub_02022974 + bl GF_AssertFail _0201A9C2: ldrb r1, [r4, #4] mov r0, #0x2c @@ -5358,7 +5358,7 @@ _0201A9C2: ldrb r0, [r0, #0x1c] cmp r0, #3 blo _0201A9D6 - bl sub_02022974 + bl GF_AssertFail _0201A9D6: ldrb r2, [r4, #4] mov r1, #0x2c diff --git a/asm/unk_0201C970.s b/asm/unk_0201C970.s index 86d6fc8a51..d26cad53ee 100644 --- a/asm/unk_0201C970.s +++ b/asm/unk_0201C970.s @@ -127,7 +127,7 @@ sub_0201CA3C: ; 0x0201CA3C bl sub_0201C9CC cmp r4, #0 bne _0201CA52 - bl sub_02022974 + bl GF_AssertFail _0201CA52: ldr r1, [r4, #0] add r0, r5, #0 @@ -408,7 +408,7 @@ _0201CC5A: blx r1 cmp r0, #0 beq _0201CC70 - bl sub_02022974 + bl GF_AssertFail _0201CC70: add sp, #0x10 mov r0, #0 @@ -423,7 +423,7 @@ _0201CC76: blx r1 cmp r0, #0 beq _0201CC8C - bl sub_02022974 + bl GF_AssertFail _0201CC8C: add sp, #0x10 mov r0, #0 @@ -438,7 +438,7 @@ _0201CC92: blx r1 cmp r0, #0 beq _0201CCA8 - bl sub_02022974 + bl GF_AssertFail _0201CCA8: add sp, #0x10 mov r0, #0 diff --git a/asm/unk_0201CCF0.s b/asm/unk_0201CCF0.s index a2d7dba82b..bb719ed237 100644 --- a/asm/unk_0201CCF0.s +++ b/asm/unk_0201CCF0.s @@ -111,7 +111,7 @@ sub_0201CD88: ; 0x0201CD88 add r5, r0, #0 add r4, r1, #0 bne _0201CD94 - bl sub_02022974 + bl GF_AssertFail _0201CD94: add r1, r4, #0 add r1, #0x34 diff --git a/asm/unk_0201D0C8.s b/asm/unk_0201D0C8.s index aacea5599c..5e7f9ca57a 100644 --- a/asm/unk_0201D0C8.s +++ b/asm/unk_0201D0C8.s @@ -14,7 +14,7 @@ sub_0201D0C8: ; 0x0201D0C8 ldr r0, _0201D0EC ; =0x0000FFFE cmp r1, r0 beq _0201D0D8 - bl sub_02022974 + bl GF_AssertFail _0201D0D8: ldrh r1, [r4] ldr r0, _0201D0EC ; =0x0000FFFE @@ -39,7 +39,7 @@ sub_0201D0F0: ; 0x0201D0F0 ldr r0, _0201D104 ; =0x0000FFFE cmp r1, r0 beq _0201D100 - bl sub_02022974 + bl GF_AssertFail _0201D100: ldrh r0, [r4, #2] pop {r4, pc} @@ -83,12 +83,12 @@ sub_0201D134: ; 0x0201D134 ldr r0, _0201D158 ; =0x0000FFFE cmp r1, r0 beq _0201D146 - bl sub_02022974 + bl GF_AssertFail _0201D146: ldrh r0, [r5, #4] cmp r4, r0 blo _0201D150 - bl sub_02022974 + bl GF_AssertFail _0201D150: lsl r0, r4, #1 add r0, r5, r0 diff --git a/asm/unk_0201D15C.s b/asm/unk_0201D15C.s index 49eae08338..1a9c9526c2 100644 --- a/asm/unk_0201D15C.s +++ b/asm/unk_0201D15C.s @@ -674,7 +674,7 @@ sub_0201D640: ; 0x0201D640 ldr r0, [r0, #0] cmp r0, #0 beq _0201D650 - bl sub_02022974 + bl GF_AssertFail _0201D650: mov r1, #2 add r0, r4, #0 diff --git a/asm/unk_0201D670.s b/asm/unk_0201D670.s index e212887b11..eac9038ddf 100644 --- a/asm/unk_0201D670.s +++ b/asm/unk_0201D670.s @@ -52,14 +52,14 @@ sub_0201D6B0: ; 0x0201D6B0 add r5, r0, #0 cmp r5, #8 blo _0201D6BC - bl sub_02022974 + bl GF_AssertFail _0201D6BC: ldr r6, _0201D6F4 ; =0x021C04E0 lsl r4, r5, #2 ldr r0, [r6, r4] cmp r0, #0 bne _0201D6CA - bl sub_02022974 + bl GF_AssertFail _0201D6CA: cmp r5, #8 bhs _0201D6F0 diff --git a/asm/unk_0201DBEC.s b/asm/unk_0201DBEC.s index d5fd9fee39..bb3e5447f8 100644 --- a/asm/unk_0201DBEC.s +++ b/asm/unk_0201DBEC.s @@ -15,7 +15,7 @@ sub_0201DBEC: ; 0x0201DBEC ldr r0, [r0, #0] cmp r0, #0 beq _0201DBFE - bl sub_02022974 + bl GF_AssertFail _0201DBFE: add r0, r4, #0 mov r1, #0xc @@ -24,7 +24,7 @@ _0201DBFE: cmp r0, #0 str r0, [r1, #0] bne _0201DC12 - bl sub_02022974 + bl GF_AssertFail _0201DC12: add r0, r4, #0 lsl r1, r5, #4 @@ -53,7 +53,7 @@ sub_0201DC3C: ; 0x0201DC3C ldr r0, [r0, #0] cmp r0, #0 bne _0201DC4A - bl sub_02022974 + bl GF_AssertFail _0201DC4A: ldr r0, _0201DC64 ; =0x021C0700 ldr r0, [r0, #0] @@ -81,7 +81,7 @@ sub_0201DC68: ; 0x0201DC68 add r7, r3, #0 cmp r0, #0 bne _0201DC7E - bl sub_02022974 + bl GF_AssertFail _0201DC7E: ldr r1, _0201DCA8 ; =0x021C0700 ldr r0, [r1, #0] @@ -93,7 +93,7 @@ _0201DC7E: ldr r0, [r0, #0] cmp r1, r0 blo _0201DC9A - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _0201DC9A: diff --git a/asm/unk_0201E3D8.s b/asm/unk_0201E3D8.s index b116713e56..2276daaf35 100644 --- a/asm/unk_0201E3D8.s +++ b/asm/unk_0201E3D8.s @@ -13,7 +13,7 @@ sub_0201E3D8: ; 0x0201E3D8 ldrh r0, [r0, #0x1a] cmp r0, #0 beq _0201E3E6 - bl sub_02022974 + bl GF_AssertFail _0201E3E6: ldr r0, _0201E3F0 ; =0x021C0744 mov r1, #0 @@ -35,7 +35,7 @@ sub_0201E3F4: ; 0x0201E3F4 add r4, r2, #0 cmp r0, #0 beq _0201E40A - bl sub_02022974 + bl GF_AssertFail _0201E40A: cmp r4, #5 bhs _0201E412 @@ -84,7 +84,7 @@ sub_0201E450: ; 0x0201E450 ldrh r0, [r0, #0x1a] cmp r0, #0 beq _0201E462 - bl sub_02022974 + bl GF_AssertFail _0201E462: cmp r4, #5 bhs _0201E46A @@ -211,7 +211,7 @@ sub_0201E530: ; 0x0201E530 ldrh r0, [r0, #0x1a] cmp r0, #0 beq _0201E540 - bl sub_02022974 + bl GF_AssertFail _0201E540: bl sub_0201E4EC add r4, r0, #0 @@ -243,7 +243,7 @@ sub_0201E564: ; 0x0201E564 mov r5, #3 cmp r0, #0 beq _0201E57A - bl sub_02022974 + bl GF_AssertFail _0201E57A: ldr r0, _0201E5B8 ; =0x021C0744 ldrh r0, [r0, #0x18] @@ -331,7 +331,7 @@ sub_0201E5FC: ; 0x0201E5FC bl sub_0201E658 cmp r0, #1 beq _0201E61E - bl sub_02022974 + bl GF_AssertFail _0201E61E: ldr r0, _0201E628 ; =0x021C0744 mov r1, #0 @@ -356,7 +356,7 @@ sub_0201E630: ; 0x0201E630 bl sub_0201E4EC cmp r0, #1 beq _0201E64C - bl sub_02022974 + bl GF_AssertFail _0201E64C: ldr r0, _0201E654 ; =0x021C0744 mov r1, #1 diff --git a/asm/unk_0201E86C.s b/asm/unk_0201E86C.s index 282f38d2e7..cd03eed90b 100644 --- a/asm/unk_0201E86C.s +++ b/asm/unk_0201E86C.s @@ -232,12 +232,12 @@ sub_0201EA24: ; 0x0201EA24 bl sub_0201EAD8 cmp r0, #1 bne _0201EA36 - bl sub_02022974 + bl GF_AssertFail _0201EA36: bl sub_0201F2D0 add r4, r0, #0 bne _0201EA46 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _0201EA46: @@ -277,12 +277,12 @@ sub_0201EA7C: ; 0x0201EA7C bl sub_0201EAD8 cmp r0, #1 bne _0201EA8E - bl sub_02022974 + bl GF_AssertFail _0201EA8E: bl sub_0201F2D0 add r4, r0, #0 bne _0201EA9E - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _0201EA9E: @@ -353,13 +353,13 @@ sub_0201EB08: ; 0x0201EB08 add r4, r0, #0 add r5, r1, #0 bne _0201EB14 - bl sub_02022974 + bl GF_AssertFail _0201EB14: add r0, r4, #0 bl sub_0201F03C add r4, r0, #0 bne _0201EB22 - bl sub_02022974 + bl GF_AssertFail _0201EB22: str r5, [r4, #0] ldr r1, [r4, #4] @@ -397,7 +397,7 @@ _0201EB58: bl sub_0201F03C add r4, r0, #0 bne _0201EB66 - bl sub_02022974 + bl GF_AssertFail _0201EB66: add r0, r4, #0 add r0, #0x3c @@ -473,7 +473,7 @@ sub_0201EBDC: ; 0x0201EBDC bl sub_0201F03C add r4, r0, #0 bne _0201EBEA - bl sub_02022974 + bl GF_AssertFail _0201EBEA: add r0, r4, #0 add r0, #0x3c @@ -497,7 +497,7 @@ sub_0201EC00: ; 0x0201EC00 bl sub_0201F03C add r4, r0, #0 bne _0201EC12 - bl sub_02022974 + bl GF_AssertFail _0201EC12: add r0, r4, #0 add r0, #0x3c @@ -563,12 +563,12 @@ sub_0201EC84: ; 0x0201EC84 bl sub_0201EF1C add r4, r0, #0 bne _0201EC94 - bl sub_02022974 + bl GF_AssertFail _0201EC94: bl sub_0201F2D0 add r5, r0, #0 bne _0201ECA0 - bl sub_02022974 + bl GF_AssertFail _0201ECA0: add r0, r4, #0 add r0, #0x3c @@ -847,7 +847,7 @@ sub_0201EE9C: ; 0x0201EE9C ldr r0, [r0, #0] cmp r0, #0 bne _0201EEAA - bl sub_02022974 + bl GF_AssertFail _0201EEAA: ldr r1, _0201EEB4 ; =0x021C0760 mov r2, #0 @@ -866,7 +866,7 @@ sub_0201EEB8: ; 0x0201EEB8 ldr r0, [r0, #0] cmp r0, #0 beq _0201EEC8 - bl sub_02022974 + bl GF_AssertFail _0201EEC8: ldr r0, _0201EED0 ; =0x021C0760 str r4, [r0, #0] @@ -1186,7 +1186,7 @@ sub_0201F0B0: ; 0x0201F0B0 str r0, [r4, #0] cmp r0, r1 bne _0201F0FC - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _0201F0FC: @@ -1220,7 +1220,7 @@ _0201F108: str r0, [r6, #0] cmp r0, r1 bne _0201F146 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _0201F146: @@ -1643,7 +1643,7 @@ _0201F3FA: _0201F436: cmp r2, #0 bne _0201F43E - bl sub_02022974 + bl GF_AssertFail _0201F43E: ldr r0, _0201F45C ; =0x021C0760 mov r2, #0 @@ -1658,7 +1658,7 @@ _0201F43E: _0201F452: cmp r2, #0 bne _0201F45A - bl sub_02022974 + bl GF_AssertFail _0201F45A: pop {r3, pc} ; .align 2, 0 @@ -1819,7 +1819,7 @@ _0201F556: ldrb r1, [r4, r1] tst r0, r1 beq _0201F578 - bl sub_02022974 + bl GF_AssertFail _0201F578: add r2, sp, #0 ldrb r3, [r2] @@ -1939,7 +1939,7 @@ _0201F632: ldrb r1, [r4, r1] tst r0, r1 bne _0201F64E - bl sub_02022974 + bl GF_AssertFail _0201F64E: ldrb r0, [r7] mov r1, #1 @@ -2123,7 +2123,7 @@ sub_0201F76C: ; 0x0201F76C add r3, r6, r5 cmp r3, r2 bls _0201F794 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 b _0201F796 _0201F794: @@ -2139,7 +2139,7 @@ _0201F796: add r2, r3, r5 cmp r2, r1 bls _0201F7B2 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _0201F7B2: diff --git a/asm/unk_0201F834.s b/asm/unk_0201F834.s index b82f98bea0..8179c49584 100644 --- a/asm/unk_0201F834.s +++ b/asm/unk_0201F834.s @@ -136,7 +136,7 @@ sub_0201F90C: ; 0x0201F90C bl sub_0201FC50 add r4, r0, #0 bne _0201F920 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _0201F920: @@ -171,7 +171,7 @@ sub_0201F950: ; 0x0201F950 bl sub_0201FC50 add r4, r0, #0 bne _0201F964 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _0201F964: @@ -204,13 +204,13 @@ sub_0201F990: ; 0x0201F990 add r4, r0, #0 add r5, r1, #0 bne _0201F99C - bl sub_02022974 + bl GF_AssertFail _0201F99C: add r0, r4, #0 bl sub_0201FC18 add r4, r0, #0 bne _0201F9AA - bl sub_02022974 + bl GF_AssertFail _0201F9AA: str r5, [r4, #0] ldr r1, [r4, #4] @@ -259,7 +259,7 @@ sub_0201F9F0: ; 0x0201F9F0 bl sub_0201FC18 add r4, r0, #0 bne _0201F9FE - bl sub_02022974 + bl GF_AssertFail _0201F9FE: add r0, r4, #0 add r0, #0x2c @@ -318,7 +318,7 @@ sub_0201FA58: ; 0x0201FA58 cmp r0, #0 bne _0201FA6C bne _0201FA68 - bl sub_02022974 + bl GF_AssertFail _0201FA68: mov r0, #0 pop {r3, pc} @@ -344,7 +344,7 @@ sub_0201FA80: ; 0x0201FA80 cmp r0, #0 bne _0201FA96 bne _0201FA92 - bl sub_02022974 + bl GF_AssertFail _0201FA92: mov r0, #0 pop {r4, pc} @@ -417,7 +417,7 @@ sub_0201FAEC: ; 0x0201FAEC bl sub_0201F9DC cmp r0, #1 bne _0201FB08 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _0201FB08: @@ -505,7 +505,7 @@ sub_0201FB94: ; 0x0201FB94 ldr r0, [r0, #4] cmp r0, #0 beq _0201FBA4 - bl sub_02022974 + bl GF_AssertFail _0201FBA4: ldr r1, [r5, #4] mov r0, #1 @@ -895,7 +895,7 @@ sub_0201FE1C: ; 0x0201FE1C add r2, r1, r2 cmp r2, r3 bls _0201FE40 - bl sub_02022974 + bl GF_AssertFail bl sub_0201F8E0 mov r0, #0 b _0201FE42 @@ -912,7 +912,7 @@ _0201FE42: ldr r1, [sp, #0x10] cmp r2, r1 bls _0201FE62 - bl sub_02022974 + bl GF_AssertFail bl sub_0201F8E0 mov r0, #0 pop {r3, r4, r5, pc} diff --git a/asm/unk_02020020.s b/asm/unk_02020020.s index 7b4f8917df..52175d3e92 100644 --- a/asm/unk_02020020.s +++ b/asm/unk_02020020.s @@ -403,7 +403,7 @@ sub_02020304: ; 0x02020304 add r0, r7, #1 cmp r0, r5 ble _02020322 - bl sub_02022974 + bl GF_AssertFail _02020322: ldr r0, [sp] mov r1, #0x24 diff --git a/asm/unk_02020AEC.s b/asm/unk_02020AEC.s index 4a3e3c8886..96efb55f71 100644 --- a/asm/unk_02020AEC.s +++ b/asm/unk_02020AEC.s @@ -106,7 +106,7 @@ sub_02020B90: ; 0x02020B90 ldr r0, [r0, #0] cmp r0, #0 beq _02020BA2 - bl sub_02022974 + bl GF_AssertFail _02020BA2: mov r1, #0xe0 add r0, r4, #0 @@ -207,7 +207,7 @@ sub_02020C44: ; 0x02020C44 bl sub_02020D74 add r4, r0, #0 bne _02020C58 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _02020C58: @@ -269,7 +269,7 @@ sub_02020CCC: ; 0x02020CCC push {r4, lr} add r4, r0, #0 bne _02020CDA - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} _02020CDA: @@ -305,7 +305,7 @@ sub_02020D14: ; 0x02020D14 cmp r0, #0 bne _02020D24 bne _02020D20 - bl sub_02022974 + bl GF_AssertFail _02020D20: mov r0, #0 pop {r3, r4, r5, pc} @@ -340,7 +340,7 @@ sub_02020D50: ; 0x02020D50 push {r4, lr} add r4, r0, #0 bne _02020D5A - bl sub_02022974 + bl GF_AssertFail _02020D5A: ldrb r0, [r4, #3] cmp r0, #0 @@ -401,7 +401,7 @@ sub_02020DA8: ; 0x02020DA8 sub sp, #0x24 add r5, r0, #0 bne _02020DB4 - bl sub_02022974 + bl GF_AssertFail _02020DB4: add r0, sp, #0 bl MTX_Identity33_ @@ -597,7 +597,7 @@ sub_02020EF8: ; 0x02020EF8 str r0, [r4, #0] cmp r0, #0 bne _02020F3A - bl sub_02022974 + bl GF_AssertFail b _02020F3A _02020F36: mov r0, #0 @@ -614,7 +614,7 @@ _02020F3A: str r0, [r6, #0] cmp r0, #0 bne _02020F5A - bl sub_02022974 + bl GF_AssertFail b _02020F5A _02020F56: mov r0, #0 @@ -634,7 +634,7 @@ _02020F5A: str r0, [r7, #0] cmp r0, #0 bne _02020F82 - bl sub_02022974 + bl GF_AssertFail add sp, #0xc pop {r4, r5, r6, r7, pc} _02020F7E: @@ -992,14 +992,14 @@ sub_020211FC: ; 0x020211FC push {r3, r4, r5, lr} add r5, r0, #0 bne _02021206 - bl sub_02022974 + bl GF_AssertFail _02021206: add r0, r5, #0 add r0, #0xb4 ldrb r0, [r0] cmp r0, #1 bne _02021214 - bl sub_02022974 + bl GF_AssertFail _02021214: add r0, r5, #0 add r0, #0xb4 @@ -1090,7 +1090,7 @@ sub_020212A8: ; 0x020212A8 add r5, r1, #0 cmp r4, #0 bne _020212B6 - bl sub_02022974 + bl GF_AssertFail _020212B6: ldmia r5!, {r0, r1} stmia r4!, {r0, r1} @@ -1104,7 +1104,7 @@ sub_020212C0: ; 0x020212C0 push {r4, lr} add r4, r0, #0 bne _020212CA - bl sub_02022974 + bl GF_AssertFail _020212CA: add r0, r4, #0 pop {r4, pc} @@ -1118,7 +1118,7 @@ sub_020212D0: ; 0x020212D0 add r5, r1, #0 cmp r4, #0 bne _020212DE - bl sub_02022974 + bl GF_AssertFail _020212DE: ldmia r5!, {r0, r1} add r4, #0xc @@ -1134,7 +1134,7 @@ sub_020212EC: ; 0x020212EC push {r4, lr} add r4, r0, #0 bne _020212F6 - bl sub_02022974 + bl GF_AssertFail _020212F6: add r4, #0xc add r0, r4, #0 @@ -1148,7 +1148,7 @@ sub_020212FC: ; 0x020212FC add r4, r1, #0 cmp r5, #0 bne _0202130A - bl sub_02022974 + bl GF_AssertFail _0202130A: str r4, [r5, #0x18] pop {r3, r4, r5, pc} @@ -1160,7 +1160,7 @@ sub_02021310: ; 0x02021310 push {r4, lr} add r4, r0, #0 bne _0202131A - bl sub_02022974 + bl GF_AssertFail _0202131A: ldr r0, [r4, #0x18] pop {r4, pc} @@ -1174,7 +1174,7 @@ sub_02021320: ; 0x02021320 add r4, r1, #0 cmp r5, #0 bne _0202132E - bl sub_02022974 + bl GF_AssertFail _0202132E: add r5, #0x24 strb r4, [r5] @@ -1186,7 +1186,7 @@ sub_02021334: ; 0x02021334 push {r4, lr} add r4, r0, #0 bne _0202133E - bl sub_02022974 + bl GF_AssertFail _0202133E: add r4, #0x24 ldrb r0, [r4] @@ -1200,7 +1200,7 @@ sub_02021344: ; 0x02021344 add r4, r1, #0 cmp r5, #0 bne _02021352 - bl sub_02022974 + bl GF_AssertFail _02021352: add r5, #0xb6 strh r4, [r5] @@ -1212,7 +1212,7 @@ sub_02021358: ; 0x02021358 push {r4, lr} add r4, r0, #0 bne _02021362 - bl sub_02022974 + bl GF_AssertFail _02021362: add r4, #0xb6 ldrh r0, [r4] @@ -1226,7 +1226,7 @@ sub_02021368: ; 0x02021368 add r4, r1, #0 cmp r5, #0 bne _02021376 - bl sub_02022974 + bl GF_AssertFail _02021376: add r0, r5, #0 add r1, r4, #0 @@ -1241,7 +1241,7 @@ sub_02021380: ; 0x02021380 add r4, r1, #0 cmp r5, #0 bne _0202138E - bl sub_02022974 + bl GF_AssertFail _0202138E: add r5, #0xb8 str r4, [r5, #0] @@ -1253,7 +1253,7 @@ sub_02021394: ; 0x02021394 push {r4, lr} add r4, r0, #0 bne _0202139E - bl sub_02022974 + bl GF_AssertFail _0202139E: add r4, #0xb8 ldr r0, [r4, #0] @@ -1267,7 +1267,7 @@ sub_020213A4: ; 0x020213A4 add r4, r1, #0 cmp r5, #0 bne _020213B2 - bl sub_02022974 + bl GF_AssertFail _020213B2: add r1, r5, #0 add r1, #0xb6 @@ -1292,7 +1292,7 @@ sub_020213D4: ; 0x020213D4 push {r4, lr} add r4, r0, #0 bne _020213DE - bl sub_02022974 + bl GF_AssertFail _020213DE: add r1, r4, #0 add r1, #0xb6 @@ -1311,7 +1311,7 @@ sub_020213F4: ; 0x020213F4 push {r4, lr} add r4, r0, #0 bne _020213FE - bl sub_02022974 + bl GF_AssertFail _020213FE: add r4, #0x88 ldr r0, [r4, #0] @@ -1323,7 +1323,7 @@ sub_02021404: ; 0x02021404 push {r4, lr} add r4, r0, #0 bne _0202140E - bl sub_02022974 + bl GF_AssertFail _0202140E: add r4, #0xb4 ldrb r0, [r4] @@ -1553,7 +1553,7 @@ _02021570: ldr r0, _0202159C ; =0x0000FFFF cmp r1, r0 bls _02021584 - bl sub_02022974 + bl GF_AssertFail _02021584: ldr r1, [r4, #0x14] ldr r0, [sp, #4] @@ -1708,7 +1708,7 @@ _02021678: ldr r0, _020216A4 ; =0x00001FFF cmp r1, r0 bls _0202168C - bl sub_02022974 + bl GF_AssertFail _0202168C: ldrh r1, [r4, #0x1c] ldr r0, [sp, #4] diff --git a/asm/unk_020218BC.s b/asm/unk_020218BC.s index add24ad273..244156b57e 100644 --- a/asm/unk_020218BC.s +++ b/asm/unk_020218BC.s @@ -11,12 +11,12 @@ sub_020218BC: ; 0x020218BC push {r3, r4, r5, lr} add r5, r0, #0 bne _020218C6 - bl sub_02022974 + bl GF_AssertFail _020218C6: ldr r0, [r5, #4] cmp r0, #0 bne _020218D0 - bl sub_02022974 + bl GF_AssertFail _020218D0: mov r1, #0x49 ldr r0, [r5, #8] @@ -24,7 +24,7 @@ _020218D0: bl sub_02018144 add r4, r0, #0 bne _020218E2 - bl sub_02022974 + bl GF_AssertFail _020218E2: add r0, r4, #0 bl sub_02021A50 @@ -37,7 +37,7 @@ _020218E2: str r0, [r4, #0] cmp r0, #0 bne _02021900 - bl sub_02022974 + bl GF_AssertFail _02021900: ldr r0, [r5, #0] str r0, [r4, #4] @@ -48,7 +48,7 @@ _02021900: str r0, [r4, #8] cmp r0, #0 bne _02021918 - bl sub_02022974 + bl GF_AssertFail _02021918: add r0, r4, #0 bl sub_02022518 @@ -177,7 +177,7 @@ sub_020219F8: ; 0x020219F8 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 bne _02021A02 - bl sub_02022974 + bl GF_AssertFail _02021A02: mov r0, #0x12 lsl r0, r0, #4 @@ -558,11 +558,11 @@ sub_02021CAC: ; 0x02021CAC add r4, r1, #0 cmp r5, #0 bne _02021CBA - bl sub_02022974 + bl GF_AssertFail _02021CBA: cmp r4, #2 blt _02021CC2 - bl sub_02022974 + bl GF_AssertFail _02021CC2: add r5, #0x34 strb r4, [r5] @@ -576,11 +576,11 @@ sub_02021CC8: ; 0x02021CC8 add r4, r1, #0 cmp r5, #0 bne _02021CD6 - bl sub_02022974 + bl GF_AssertFail _02021CD6: cmp r4, #2 blt _02021CDE - bl sub_02022974 + bl GF_AssertFail _02021CDE: add r5, #0x35 strb r4, [r5] @@ -594,7 +594,7 @@ sub_02021CE4: ; 0x02021CE4 add r4, r1, #0 cmp r5, #0 bne _02021CF2 - bl sub_02022974 + bl GF_AssertFail _02021CF2: str r4, [r5, #0x38] pop {r3, r4, r5, pc} @@ -608,7 +608,7 @@ sub_02021CF8: ; 0x02021CF8 add r4, r1, #0 cmp r5, #0 bne _02021D06 - bl sub_02022974 + bl GF_AssertFail _02021D06: add r5, #0x26 strb r4, [r5] @@ -622,7 +622,7 @@ sub_02021D0C: ; 0x02021D0C add r4, r1, #0 cmp r5, #0 bne _02021D1A - bl sub_02022974 + bl GF_AssertFail _02021D1A: add r0, r5, #0 add r0, #0x27 @@ -672,7 +672,7 @@ sub_02021D44: ; 0x02021D44 push {r4, lr} add r4, r0, #0 bne _02021D4E - bl sub_02022974 + bl GF_AssertFail _02021D4E: add r0, r4, #0 add r0, #0xec @@ -701,7 +701,7 @@ sub_02021D6C: ; 0x02021D6C bl sub_02021D44 cmp r0, r4 bhi _02021D7E - bl sub_02022974 + bl GF_AssertFail _02021D7E: lsl r0, r4, #0x10 lsr r1, r0, #0x10 @@ -877,7 +877,7 @@ sub_02021E90: ; 0x02021E90 add r4, r1, #0 cmp r5, #0 bne _02021E9E - bl sub_02022974 + bl GF_AssertFail _02021E9E: add r0, r5, #0 add r0, #0x29 @@ -935,7 +935,7 @@ sub_02021EF0: ; 0x02021EF0 add r4, r1, #0 cmp r5, #0 bne _02021EFE - bl sub_02022974 + bl GF_AssertFail _02021EFE: add r0, r5, #0 add r0, #0x2a @@ -983,7 +983,7 @@ sub_02021F48: ; 0x02021F48 push {r4, lr} add r4, r0, #0 bne _02021F52 - bl sub_02022974 + bl GF_AssertFail _02021F52: add r4, #0x2a ldrb r0, [r4] @@ -1083,7 +1083,7 @@ sub_02021FD0: ; 0x02021FD0 push {r4, lr} add r4, r0, #0 bne _02021FDA - bl sub_02022974 + bl GF_AssertFail _02021FDA: ldr r0, [r4, #0x54] pop {r4, pc} @@ -1097,7 +1097,7 @@ sub_02021FE0: ; 0x02021FE0 add r5, r1, #0 cmp r4, #0 bne _02021FEE - bl sub_02022974 + bl GF_AssertFail _02021FEE: str r5, [r4, #0x30] cmp r5, #0 diff --git a/asm/unk_02022974.s b/asm/unk_02022974.s index 6f77fa4998..53db9ecb8c 100644 --- a/asm/unk_02022974.s +++ b/asm/unk_02022974.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_02022974 -sub_02022974: ; 0x02022974 + thumb_func_start GF_AssertFail +GF_AssertFail: ; 0x02022974 push {r3, lr} bl sub_02036780 cmp r0, #0 @@ -18,4 +18,4 @@ sub_02022974: ; 0x02022974 bl sub_0209B49C _0202298A: pop {r3, pc} - thumb_func_end sub_02022974 \ No newline at end of file + thumb_func_end GF_AssertFail \ No newline at end of file diff --git a/asm/unk_0202298C.s b/asm/unk_0202298C.s index e4138e0138..9b7fde9443 100644 --- a/asm/unk_0202298C.s +++ b/asm/unk_0202298C.s @@ -16,7 +16,7 @@ sub_0202298C: ; 0x0202298C bl sub_02018144 add r6, r0, #0 bne _020229A2 - bl sub_02022974 + bl GF_AssertFail _020229A2: add r0, r4, #0 lsl r1, r7, #3 @@ -24,7 +24,7 @@ _020229A2: str r0, [r6, #0] cmp r0, #0 bne _020229B4 - bl sub_02022974 + bl GF_AssertFail _020229B4: mov r4, #0 cmp r7, #0 @@ -52,7 +52,7 @@ sub_020229D8: ; 0x020229D8 push {r4, lr} add r4, r0, #0 bne _020229E2 - bl sub_02022974 + bl GF_AssertFail _020229E2: add r0, r4, #0 bl sub_02022AE4 @@ -71,7 +71,7 @@ sub_020229F8: ; 0x020229F8 add r4, r1, #0 cmp r5, #0 bne _02022A06 - bl sub_02022974 + bl GF_AssertFail _02022A06: add r0, r5, #0 add r1, r4, #0 @@ -94,20 +94,20 @@ sub_02022A1C: ; 0x02022A1C add r6, r2, #0 cmp r5, #0 bne _02022A2C - bl sub_02022974 + bl GF_AssertFail _02022A2C: add r0, r5, #0 bl sub_02022B90 add r4, r0, #0 bne _02022A3A - bl sub_02022974 + bl GF_AssertFail _02022A3A: add r0, r5, #0 add r1, r6, #0 bl sub_020229F8 cmp r0, #1 beq _02022A4A - bl sub_02022974 + bl GF_AssertFail _02022A4A: str r7, [r4, #4] str r6, [r4, #0] @@ -127,24 +127,24 @@ sub_02022A58: ; 0x02022A58 str r3, [sp] cmp r5, #0 bne _02022A6A - bl sub_02022974 + bl GF_AssertFail _02022A6A: cmp r6, #0 bne _02022A72 - bl sub_02022974 + bl GF_AssertFail _02022A72: add r0, r5, #0 bl sub_02022B90 add r4, r0, #0 bne _02022A80 - bl sub_02022974 + bl GF_AssertFail _02022A80: add r0, r5, #0 add r1, r7, #0 bl sub_020229F8 cmp r0, #1 beq _02022A90 - bl sub_02022974 + bl GF_AssertFail _02022A90: ldr r0, [sp] add r1, r6, #0 @@ -152,7 +152,7 @@ _02022A90: str r0, [r4, #4] cmp r0, #0 bne _02022AA2 - bl sub_02022974 + bl GF_AssertFail _02022AA2: str r7, [r4, #0] ldr r0, [r5, #8] @@ -170,11 +170,11 @@ sub_02022AB0: ; 0x02022AB0 add r4, r1, #0 cmp r5, #0 bne _02022ABE - bl sub_02022974 + bl GF_AssertFail _02022ABE: cmp r4, #0 bne _02022AC6 - bl sub_02022974 + bl GF_AssertFail _02022AC6: ldr r0, [r4, #4] cmp r0, #0 @@ -198,12 +198,12 @@ sub_02022AE4: ; 0x02022AE4 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 bne _02022AEE - bl sub_02022974 + bl GF_AssertFail _02022AEE: ldr r0, [r5, #0] cmp r0, #0 bne _02022AF8 - bl sub_02022974 + bl GF_AssertFail _02022AF8: ldr r0, [r5, #4] mov r6, #0 @@ -236,7 +236,7 @@ sub_02022B20: ; 0x02022B20 add r4, r1, #0 cmp r5, #0 bne _02022B2E - bl sub_02022974 + bl GF_AssertFail _02022B2E: ldr r6, [r5, #4] mov r1, #0 @@ -267,7 +267,7 @@ sub_02022B54: ; 0x02022B54 push {r4, lr} add r4, r0, #0 bne _02022B5E - bl sub_02022974 + bl GF_AssertFail _02022B5E: ldr r0, [r4, #4] pop {r4, pc} @@ -281,7 +281,7 @@ sub_02022B64: ; 0x02022B64 add r4, r1, #0 cmp r5, #0 bne _02022B72 - bl sub_02022974 + bl GF_AssertFail _02022B72: ldr r0, [r5, #4] cmp r0, #0 @@ -297,7 +297,7 @@ sub_02022B80: ; 0x02022B80 push {r4, lr} add r4, r0, #0 bne _02022B8A - bl sub_02022974 + bl GF_AssertFail _02022B8A: ldr r0, [r4, #0] pop {r4, pc} @@ -309,7 +309,7 @@ sub_02022B90: ; 0x02022B90 push {r3, r4, r5, lr} add r4, r0, #0 bne _02022B9A - bl sub_02022974 + bl GF_AssertFail _02022B9A: ldr r5, [r4, #4] mov r2, #0 @@ -340,7 +340,7 @@ sub_02022BC0: ; 0x02022BC0 push {r4, lr} add r4, r0, #0 bne _02022BCA - bl sub_02022974 + bl GF_AssertFail _02022BCA: mov r0, #0 mvn r0, r0 @@ -392,7 +392,7 @@ sub_02022C1C: ; 0x02022C1C push {r4, lr} add r4, r0, #0 bne _02022C26 - bl sub_02022974 + bl GF_AssertFail _02022C26: add r0, r4, #0 bl sub_02022D58 @@ -412,7 +412,7 @@ sub_02022C40: ; 0x02022C40 add r4, r1, #0 cmp r5, #0 bne _02022C4E - bl sub_02022974 + bl GF_AssertFail _02022C4E: ldr r0, [r5, #0] add r1, r4, #0 @@ -429,7 +429,7 @@ sub_02022C58: ; 0x02022C58 str r2, [sp] cmp r5, #0 bne _02022C6A - bl sub_02022974 + bl GF_AssertFail _02022C6A: add r0, r5, #0 bl sub_02022F2C @@ -478,11 +478,11 @@ sub_02022CB4: ; 0x02022CB4 add r4, r1, #0 cmp r5, #0 bne _02022CC2 - bl sub_02022974 + bl GF_AssertFail _02022CC2: cmp r4, #0 bne _02022CCA - bl sub_02022974 + bl GF_AssertFail _02022CCA: ldrh r0, [r4, #0x16] cmp r0, #1 @@ -509,7 +509,7 @@ _02022CEC: blx r1 cmp r0, #0 beq _02022D00 - bl sub_02022974 + bl GF_AssertFail _02022D00: ldr r0, [r4, #8] cmp r0, #0 @@ -519,7 +519,7 @@ _02022D00: blx r1 cmp r0, #0 beq _02022D14 - bl sub_02022974 + bl GF_AssertFail _02022D14: ldr r0, [r4, #0xc] cmp r0, #0 @@ -529,7 +529,7 @@ _02022D14: blx r1 cmp r0, #0 beq _02022D28 - bl sub_02022974 + bl GF_AssertFail _02022D28: add r0, r4, #0 bl sub_02022F5C @@ -546,7 +546,7 @@ sub_02022D38: ; 0x02022D38 add r4, r1, #0 cmp r5, #0 bne _02022D46 - bl sub_02022974 + bl GF_AssertFail _02022D46: add r0, r5, #0 add r1, r4, #0 @@ -562,12 +562,12 @@ sub_02022D58: ; 0x02022D58 push {r4, r5, r6, lr} add r5, r0, #0 bne _02022D62 - bl sub_02022974 + bl GF_AssertFail _02022D62: ldr r0, [r5, #4] cmp r0, #0 bne _02022D6C - bl sub_02022974 + bl GF_AssertFail _02022D6C: ldr r0, [r5, #0] mov r6, #0 @@ -602,7 +602,7 @@ sub_02022D98: ; 0x02022D98 add r7, r1, #0 cmp r6, #0 bne _02022DA6 - bl sub_02022974 + bl GF_AssertFail _02022DA6: ldr r0, [r6, #0] mov r4, #0 @@ -642,7 +642,7 @@ sub_02022DE0: ; 0x02022DE0 push {r4, lr} add r4, r0, #0 bne _02022DEA - bl sub_02022974 + bl GF_AssertFail _02022DEA: ldr r0, [r4, #0] bl sub_02022B80 @@ -655,7 +655,7 @@ sub_02022DF4: ; 0x02022DF4 push {r4, lr} add r4, r0, #0 bne _02022DFE - bl sub_02022974 + bl GF_AssertFail _02022DFE: add r0, r4, #0 bl sub_02022F70 @@ -668,17 +668,17 @@ sub_02022E08: ; 0x02022E08 push {r4, lr} add r4, r0, #0 bne _02022E12 - bl sub_02022974 + bl GF_AssertFail _02022E12: ldrh r0, [r4, #0x14] cmp r0, #0 beq _02022E1C - bl sub_02022974 + bl GF_AssertFail _02022E1C: ldr r0, [r4, #0xc] cmp r0, #0 bne _02022E28 - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} _02022E28: add r0, r4, #0 @@ -696,7 +696,7 @@ sub_02022E38: ; 0x02022E38 add r4, r1, #0 cmp r5, #0 bne _02022E46 - bl sub_02022974 + bl GF_AssertFail _02022E46: add r0, r5, #0 add r1, r4, #0 @@ -710,18 +710,18 @@ sub_02022E54: ; 0x02022E54 push {r4, lr} add r4, r0, #0 bne _02022E5E - bl sub_02022974 + bl GF_AssertFail _02022E5E: ldrh r0, [r4, #0x16] cmp r0, #0 bne _02022E6A - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} _02022E6A: ldrh r0, [r4, #0x14] cmp r0, #0 beq _02022E76 - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} _02022E76: add r0, r4, #0 @@ -749,7 +749,7 @@ sub_02022EA0: ; 0x02022EA0 add r4, r1, #0 cmp r5, #0 bne _02022EAE - bl sub_02022974 + bl GF_AssertFail _02022EAE: add r0, r5, #0 add r1, r4, #0 @@ -763,17 +763,17 @@ sub_02022EBC: ; 0x02022EBC push {r4, lr} add r4, r0, #0 bne _02022EC6 - bl sub_02022974 + bl GF_AssertFail _02022EC6: ldrh r0, [r4, #0x14] cmp r0, #0 beq _02022ED0 - bl sub_02022974 + bl GF_AssertFail _02022ED0: ldr r0, [r4, #0xc] cmp r0, #0 beq _02022EDC - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} _02022EDC: add r0, r4, #0 @@ -793,7 +793,7 @@ sub_02022EF4: ; 0x02022EF4 push {r4, lr} add r4, r0, #0 bne _02022EFE - bl sub_02022974 + bl GF_AssertFail _02022EFE: ldr r0, [r4, #4] pop {r4, pc} @@ -805,7 +805,7 @@ sub_02022F04: ; 0x02022F04 push {r4, lr} add r4, r0, #0 bne _02022F0E - bl sub_02022974 + bl GF_AssertFail _02022F0E: ldr r0, [r4, #8] pop {r4, pc} @@ -817,7 +817,7 @@ sub_02022F14: ; 0x02022F14 push {r4, lr} add r4, r0, #0 bne _02022F1E - bl sub_02022974 + bl GF_AssertFail _02022F1E: ldr r0, [r4, #0xc] pop {r4, pc} @@ -1036,7 +1036,7 @@ sub_02023084: ; 0x02023084 bl NNS_G3dGetTex add r4, r0, #0 bne _02023094 - bl sub_02022974 + bl GF_AssertFail _02023094: ldr r0, [r4, #0x14] add r0, r4, r0 diff --git a/asm/unk_020232E0.s b/asm/unk_020232E0.s index 926b1f3f8d..326d60b885 100644 --- a/asm/unk_020232E0.s +++ b/asm/unk_020232E0.s @@ -100,7 +100,7 @@ _02023388: ldr r0, [r5, #0x60] cmp r0, #0 bne _02023392 - bl sub_02022974 + bl GF_AssertFail _02023392: ldr r0, [sp, #0x18] ldr r1, [r5, #0x64] @@ -127,7 +127,7 @@ _020233B0: cmp r0, #2 bls _020233C8 _020233C4: - bl sub_02022974 + bl GF_AssertFail _020233C8: add r0, r5, #0 add r0, #0x6a diff --git a/asm/unk_02023790.s b/asm/unk_02023790.s index cbe9ee42ec..2ef57f6654 100644 --- a/asm/unk_02023790.s +++ b/asm/unk_02023790.s @@ -35,13 +35,13 @@ sub_020237BC: ; 0x020237BC push {r4, lr} add r4, r0, #0 bne _020237C6 - bl sub_02022974 + bl GF_AssertFail _020237C6: ldr r1, [r4, #4] ldr r0, _020237E0 ; =0xB6F8D2EC cmp r1, r0 beq _020237D2 - bl sub_02022974 + bl GF_AssertFail _020237D2: ldr r0, _020237E4 ; =0xB6F8D2ED str r0, [r4, #4] @@ -58,13 +58,13 @@ sub_020237E8: ; 0x020237E8 push {r4, lr} add r4, r0, #0 bne _020237F2 - bl sub_02022974 + bl GF_AssertFail _020237F2: ldr r1, [r4, #4] ldr r0, _02023808 ; =0xB6F8D2EC cmp r1, r0 beq _020237FE - bl sub_02022974 + bl GF_AssertFail _020237FE: mov r0, #0 strh r0, [r4, #2] @@ -83,23 +83,23 @@ sub_02023810: ; 0x02023810 add r4, r1, #0 cmp r5, #0 bne _0202381E - bl sub_02022974 + bl GF_AssertFail _0202381E: ldr r1, [r5, #4] ldr r0, _02023864 ; =0xB6F8D2EC cmp r1, r0 beq _0202382A - bl sub_02022974 + bl GF_AssertFail _0202382A: cmp r4, #0 bne _02023832 - bl sub_02022974 + bl GF_AssertFail _02023832: ldr r1, [r4, #4] ldr r0, _02023864 ; =0xB6F8D2EC cmp r1, r0 beq _0202383E - bl sub_02022974 + bl GF_AssertFail _0202383E: ldrh r2, [r4, #2] ldrh r0, [r5] @@ -116,7 +116,7 @@ _0202383E: strh r0, [r5, #2] pop {r3, r4, r5, pc} _0202385C: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} nop _02023864: .word 0xB6F8D2EC @@ -129,13 +129,13 @@ sub_02023868: ; 0x02023868 add r4, r1, #0 cmp r5, #0 bne _02023876 - bl sub_02022974 + bl GF_AssertFail _02023876: ldr r1, [r5, #4] ldr r0, _0202389C ; =0xB6F8D2EC cmp r1, r0 beq _02023882 - bl sub_02022974 + bl GF_AssertFail _02023882: ldrh r0, [r5, #2] add r1, r4, #0 @@ -164,13 +164,13 @@ sub_020238A0: ; 0x020238A0 str r0, [sp, #0x20] cmp r5, #0 bne _020238B8 - bl sub_02022974 + bl GF_AssertFail _020238B8: ldr r1, [r5, #4] ldr r0, _020239B8 ; =0xB6F8D2EC cmp r1, r0 beq _020238C4 - bl sub_02022974 + bl GF_AssertFail _020238C4: cmp r6, #0 bge _020238CC @@ -307,7 +307,7 @@ _020239A2: strh r1, [r0, #8] pop {r3, r4, r5, r6, r7, pc} _020239B0: - bl sub_02022974 + bl GF_AssertFail add sp, #8 pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -334,13 +334,13 @@ sub_020239D4: ; 0x020239D4 str r0, [sp, #0x2c] cmp r5, #0 bne _020239F0 - bl sub_02022974 + bl GF_AssertFail _020239F0: ldr r1, [r5, #4] ldr r0, _02023B20 ; =0xB6F8D2EC cmp r1, r0 beq _020239FC - bl sub_02022974 + bl GF_AssertFail _020239FC: ldrh r0, [r5] cmp r0, r4 @@ -496,7 +496,7 @@ _02023B0A: strh r1, [r0, #8] pop {r4, r5, r6, r7, pc} _02023B18: - bl sub_02022974 + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} ; .align 2, 0 @@ -604,23 +604,23 @@ sub_02023BE0: ; 0x02023BE0 add r4, r1, #0 cmp r5, #0 bne _02023BEE - bl sub_02022974 + bl GF_AssertFail _02023BEE: ldr r1, [r5, #4] ldr r0, _02023C34 ; =0xB6F8D2EC cmp r1, r0 beq _02023BFA - bl sub_02022974 + bl GF_AssertFail _02023BFA: cmp r4, #0 bne _02023C02 - bl sub_02022974 + bl GF_AssertFail _02023C02: ldr r1, [r4, #4] ldr r0, _02023C34 ; =0xB6F8D2EC cmp r1, r0 beq _02023C0E - bl sub_02022974 + bl GF_AssertFail _02023C0E: ldrh r1, [r5, #8] ldrh r0, [r4, #8] @@ -653,13 +653,13 @@ sub_02023C3C: ; 0x02023C3C push {r4, lr} add r4, r0, #0 bne _02023C46 - bl sub_02022974 + bl GF_AssertFail _02023C46: ldr r1, [r4, #4] ldr r0, _02023C58 ; =0xB6F8D2EC cmp r1, r0 beq _02023C52 - bl sub_02022974 + bl GF_AssertFail _02023C52: ldrh r0, [r4, #2] pop {r4, pc} @@ -672,13 +672,13 @@ sub_02023C5C: ; 0x02023C5C push {r3, r4, r5, lr} add r4, r0, #0 bne _02023C66 - bl sub_02022974 + bl GF_AssertFail _02023C66: ldr r1, [r4, #4] ldr r0, _02023C98 ; =0xB6F8D2EC cmp r1, r0 beq _02023C72 - bl sub_02022974 + bl GF_AssertFail _02023C72: ldrh r1, [r4, #2] mov r3, #0 @@ -713,23 +713,23 @@ sub_02023C9C: ; 0x02023C9C add r6, r2, #0 cmp r5, #0 bne _02023CAC - bl sub_02022974 + bl GF_AssertFail _02023CAC: ldr r1, [r5, #4] ldr r0, _02023D24 ; =0xB6F8D2EC cmp r1, r0 beq _02023CB8 - bl sub_02022974 + bl GF_AssertFail _02023CB8: cmp r7, #0 bne _02023CC0 - bl sub_02022974 + bl GF_AssertFail _02023CC0: ldr r1, [r7, #4] ldr r0, _02023D24 ; =0xB6F8D2EC cmp r1, r0 beq _02023CCC - bl sub_02022974 + bl GF_AssertFail _02023CCC: mov r4, #0 cmp r6, #0 @@ -788,13 +788,13 @@ sub_02023D28: ; 0x02023D28 add r4, r1, #0 cmp r5, #0 bne _02023D36 - bl sub_02022974 + bl GF_AssertFail _02023D36: ldr r1, [r5, #4] ldr r0, _02023D84 ; =0xB6F8D2EC cmp r1, r0 beq _02023D42 - bl sub_02022974 + bl GF_AssertFail _02023D42: mov r0, #0 strh r0, [r5, #2] @@ -809,7 +809,7 @@ _02023D50: sub r2, r2, #1 cmp r0, r2 blt _02023D60 - bl sub_02022974 + bl GF_AssertFail b _02023D76 _02023D60: add r2, r0, #0 @@ -843,13 +843,13 @@ sub_02023D8C: ; 0x02023D8C add r4, r2, #0 cmp r5, #0 bne _02023D9C - bl sub_02022974 + bl GF_AssertFail _02023D9C: ldr r1, [r5, #4] ldr r0, _02023DE8 ; =0xB6F8D2EC cmp r1, r0 beq _02023DA8 - bl sub_02022974 + bl GF_AssertFail _02023DA8: ldrh r0, [r5] cmp r4, r0 @@ -882,7 +882,7 @@ _02023DD4: strh r1, [r0, #6] pop {r3, r4, r5, r6, r7, pc} _02023DE2: - bl sub_02022974 + bl GF_AssertFail _02023DE6: pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -898,13 +898,13 @@ sub_02023DF0: ; 0x02023DF0 add r4, r2, #0 cmp r5, #0 bne _02023E00 - bl sub_02022974 + bl GF_AssertFail _02023E00: ldr r1, [r5, #4] ldr r0, _02023E28 ; =0xB6F8D2EC cmp r1, r0 beq _02023E0C - bl sub_02022974 + bl GF_AssertFail _02023E0C: ldrh r0, [r5, #2] add r2, r0, #1 @@ -917,7 +917,7 @@ _02023E0C: bl memcpy pop {r4, r5, r6, pc} _02023E22: - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} ; .align 2, 0 _02023E28: .word 0xB6F8D2EC @@ -928,13 +928,13 @@ sub_02023E2C: ; 0x02023E2C push {r4, lr} add r4, r0, #0 bne _02023E36 - bl sub_02022974 + bl GF_AssertFail _02023E36: ldr r1, [r4, #4] ldr r0, _02023E48 ; =0xB6F8D2EC cmp r1, r0 beq _02023E42 - bl sub_02022974 + bl GF_AssertFail _02023E42: add r4, #8 add r0, r4, #0 @@ -950,23 +950,23 @@ sub_02023E4C: ; 0x02023E4C add r4, r1, #0 cmp r5, #0 bne _02023E5A - bl sub_02022974 + bl GF_AssertFail _02023E5A: ldr r1, [r5, #4] ldr r0, _02023EAC ; =0xB6F8D2EC cmp r1, r0 beq _02023E66 - bl sub_02022974 + bl GF_AssertFail _02023E66: cmp r4, #0 bne _02023E6E - bl sub_02022974 + bl GF_AssertFail _02023E6E: ldr r1, [r4, #4] ldr r0, _02023EAC ; =0xB6F8D2EC cmp r1, r0 beq _02023E7A - bl sub_02022974 + bl GF_AssertFail _02023E7A: ldrh r2, [r4, #2] ldrh r0, [r5, #2] @@ -990,7 +990,7 @@ _02023E7A: strh r0, [r5, #2] pop {r3, r4, r5, pc} _02023EA6: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} ; .align 2, 0 _02023EAC: .word 0xB6F8D2EC @@ -1003,13 +1003,13 @@ sub_02023EB0: ; 0x02023EB0 add r4, r1, #0 cmp r5, #0 bne _02023EBE - bl sub_02022974 + bl GF_AssertFail _02023EBE: ldr r1, [r5, #4] ldr r0, _02023EF0 ; =0xB6F8D2EC cmp r1, r0 beq _02023ECA - bl sub_02022974 + bl GF_AssertFail _02023ECA: ldrh r2, [r5, #2] ldrh r0, [r5] @@ -1027,7 +1027,7 @@ _02023ECA: strh r1, [r0, #8] pop {r3, r4, r5, pc} _02023EE8: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} nop _02023EF0: .word 0xB6F8D2EC @@ -1125,13 +1125,13 @@ sub_02023F8C: ; 0x02023F8C add r4, r1, #0 cmp r5, #0 bne _02023F9A - bl sub_02022974 + bl GF_AssertFail _02023F9A: ldr r1, [r5, #4] ldr r0, _02023FC4 ; =0xB6F8D2EC cmp r1, r0 beq _02023FA6 - bl sub_02022974 + bl GF_AssertFail _02023FA6: ldrh r0, [r5, #2] cmp r0, r4 diff --git a/asm/unk_02023FCC.s b/asm/unk_02023FCC.s index d18b5065fe..86bfe48a50 100644 --- a/asm/unk_02023FCC.s +++ b/asm/unk_02023FCC.s @@ -15,7 +15,7 @@ sub_02023FCC: ; 0x02023FCC str r3, [sp] cmp r7, #0 bne _02023FDE - bl sub_02022974 + bl GF_AssertFail _02023FDE: ldr r0, [sp, #0x18] mov r1, #0x14 @@ -70,7 +70,7 @@ sub_02024034: ; 0x02024034 push {r4, lr} add r4, r0, #0 bne _0202403E - bl sub_02022974 + bl GF_AssertFail _0202403E: ldr r0, [r4, #0x10] bl sub_020181C4 diff --git a/asm/unk_020244AC.s b/asm/unk_020244AC.s index bc40109369..2e385f6eaf 100644 --- a/asm/unk_020244AC.s +++ b/asm/unk_020244AC.s @@ -136,7 +136,7 @@ sub_020245A4: ; 0x020245A4 ldr r0, [r0, #0] cmp r0, #0 bne _020245B2 - bl sub_02022974 + bl GF_AssertFail _020245B2: ldr r0, _020245B8 ; =0x021C0794 ldr r0, [r0, #0] @@ -152,7 +152,7 @@ sub_020245BC: ; 0x020245BC add r5, r0, #0 cmp r4, #0x26 blt _020245CA - bl sub_02022974 + bl GF_AssertFail _020245CA: lsl r0, r4, #4 add r1, r5, r0 @@ -372,17 +372,17 @@ sub_02024760: ; 0x02024760 add r5, r0, #0 cmp r4, #2 blt _0202476E - bl sub_02022974 + bl GF_AssertFail _0202476E: ldr r0, [r5, #8] cmp r0, #0 beq _02024778 - bl sub_02022974 + bl GF_AssertFail _02024778: ldr r0, [r5, #4] cmp r0, #1 beq _02024782 - bl sub_02022974 + bl GF_AssertFail _02024782: add r0, r5, #0 add r1, r4, #0 @@ -597,7 +597,7 @@ sub_0202489C: ; 0x0202489C ldr r0, [r5, #8] cmp r0, #0 bne _020248B6 - bl sub_02022974 + bl GF_AssertFail _020248B6: ldr r0, [r5, #8] add r0, r4, r0 @@ -784,7 +784,7 @@ sub_020249D4: ; 0x020249D4 ble _02024A14 cmp r0, #0 bgt _02024A0A - bl sub_02022974 + bl GF_AssertFail _02024A0A: mov r0, #0 str r0, [r5, #0] @@ -795,7 +795,7 @@ _02024A14: bge _02024A28 cmp r0, #0 blt _02024A1E - bl sub_02022974 + bl GF_AssertFail _02024A1E: mov r0, #1 str r0, [r5, #0] @@ -1111,7 +1111,7 @@ _02024C62: ldr r0, [r0, r1] cmp r2, r0 beq _02024C8A - bl sub_02022974 + bl GF_AssertFail _02024C8A: ldr r0, [sp, #0xc] add r1, sp, #0x2c @@ -1137,7 +1137,7 @@ _02024CA0: ldr r0, [r0, r2] cmp r3, r0 beq _02024CBE - bl sub_02022974 + bl GF_AssertFail _02024CBE: ldr r0, [sp, #0xc] add r1, sp, #0x2c @@ -1820,7 +1820,7 @@ sub_020251A4: ; 0x020251A4 ldr r0, [r0, #0] cmp r5, r0 blt _020251B6 - bl sub_02022974 + bl GF_AssertFail _020251B6: lsl r0, r5, #4 add r0, r4, r0 @@ -1854,7 +1854,7 @@ sub_020251DC: ; 0x020251DC str r0, [sp] cmp r0, #0x26 beq _020251F4 - bl sub_02022974 + bl GF_AssertFail _020251F4: ldr r0, [sp] mov r6, #0 @@ -1866,7 +1866,7 @@ _02025200: ldr r0, [r4, #0] cmp r6, r0 beq _0202520A - bl sub_02022974 + bl GF_AssertFail _0202520A: ldr r0, [r4, #0] str r0, [r5, #0] @@ -1901,7 +1901,7 @@ _02025240: lsl r0, r0, #0x10 cmp r7, r0 ble _0202524C - bl sub_02022974 + bl GF_AssertFail _0202524C: add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -1976,12 +1976,12 @@ _02025292: ldr r0, [sp, #4] cmp r0, r1 beq _020252D4 - bl sub_02022974 + bl GF_AssertFail _020252D4: ldr r0, [sp, #4] cmp r0, #0x20 ble _020252DE - bl sub_02022974 + bl GF_AssertFail _020252DE: add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -2059,7 +2059,7 @@ _0202535C: bl sub_02025680 add r4, r0, #0 bne _02025374 - bl sub_02022974 + bl GF_AssertFail _02025374: ldr r0, [r5, #8] blx r0 @@ -2176,7 +2176,7 @@ sub_02025428: ; 0x02025428 ldr r0, [r0, #0] cmp r5, r0 blt _02025444 - bl sub_02022974 + bl GF_AssertFail _02025444: ldr r1, _0202556C ; =0x020E5834 lsl r0, r5, #4 @@ -2184,7 +2184,7 @@ _02025444: ldr r0, [r1, r0] cmp r0, r5 beq _02025454 - bl sub_02022974 + bl GF_AssertFail _02025454: ldr r0, [r4, #8] blx r0 @@ -2217,7 +2217,7 @@ _02025454: bl sub_020253E0 cmp r0, #1 beq _0202549C - bl sub_02022974 + bl GF_AssertFail _0202549C: ldr r0, [r4, #8] blx r0 @@ -2244,7 +2244,7 @@ _0202549C: bl sub_020253E0 cmp r0, #1 beq _0202554A - bl sub_02022974 + bl GF_AssertFail b _0202554A _020254DA: blx r0 @@ -2269,7 +2269,7 @@ _020254DA: bl sub_020253E0 cmp r0, #1 beq _02025510 - bl sub_02022974 + bl GF_AssertFail _02025510: ldr r0, [r4, #8] blx r0 @@ -2295,7 +2295,7 @@ _02025510: bl sub_020253E0 cmp r0, #1 beq _0202554A - bl sub_02022974 + bl GF_AssertFail _0202554A: ldr r0, [sp] cmp r0, #1 @@ -2330,7 +2330,7 @@ sub_02025574: ; 0x02025574 ldr r0, [r0, #0] cmp r5, r0 blt _02025590 - bl sub_02022974 + bl GF_AssertFail _02025590: ldr r1, _0202567C ; =0x020E5834 lsl r0, r5, #4 @@ -2338,7 +2338,7 @@ _02025590: ldr r0, [r1, r0] cmp r0, r5 beq _020255A0 - bl sub_02022974 + bl GF_AssertFail _020255A0: ldr r0, [r4, #8] blx r0 @@ -2399,7 +2399,7 @@ _020255BA: bl sub_020253E0 cmp r0, #1 beq _0202565C - bl sub_02022974 + bl GF_AssertFail b _0202565C _02025626: blx r0 @@ -2424,7 +2424,7 @@ _02025626: bl sub_020253E0 cmp r0, #1 beq _0202565C - bl sub_02022974 + bl GF_AssertFail _0202565C: cmp r6, #1 bne _0202566C @@ -2456,7 +2456,7 @@ sub_02025680: ; 0x02025680 str r3, [sp] cmp r7, r0 blt _02025698 - bl sub_02022974 + bl GF_AssertFail _02025698: ldr r1, _020257E0 ; =0x020E5834 lsl r0, r7, #4 @@ -2464,7 +2464,7 @@ _02025698: ldr r0, [r1, r0] cmp r0, r7 beq _020256A8 - bl sub_02022974 + bl GF_AssertFail _020256A8: ldr r0, [r4, #8] blx r0 @@ -2632,11 +2632,11 @@ sub_020257E8: ; 0x020257E8 ldr r0, [r0, #0] cmp r6, r0 blt _02025808 - bl sub_02022974 + bl GF_AssertFail _02025808: cmp r6, #0 bne _02025810 - bl sub_02022974 + bl GF_AssertFail _02025810: ldr r1, _020259F4 ; =0x020E5834 lsl r0, r6, #4 @@ -2644,7 +2644,7 @@ _02025810: ldr r0, [r1, r0] cmp r0, r6 beq _02025820 - bl sub_02022974 + bl GF_AssertFail _02025820: ldr r0, [r4, #8] blx r0 @@ -2919,7 +2919,7 @@ sub_02025A3C: ; 0x02025A3C mvn r0, r0 cmp r4, r0 bne _02025A50 - bl sub_02022974 + bl GF_AssertFail _02025A50: lsl r0, r4, #0x10 lsr r0, r0, #0x10 @@ -2992,7 +2992,7 @@ sub_02025AC0: ; 0x02025AC0 mvn r0, r0 cmp r4, r0 bne _02025ADC - bl sub_02022974 + bl GF_AssertFail _02025ADC: lsl r0, r4, #0x10 lsr r0, r0, #0x10 @@ -3055,7 +3055,7 @@ sub_02025B3C: ; 0x02025B3C mvn r0, r0 cmp r4, r0 bne _02025B58 - bl sub_02022974 + bl GF_AssertFail _02025B58: lsl r0, r4, #0x10 lsr r0, r0, #0x10 @@ -3136,7 +3136,7 @@ _02025BF0: str r0, [r4, #0] b _02025C10 _02025BF6: - bl sub_02022974 + bl GF_AssertFail _02025BFA: mov r1, #0 add r0, r5, #0 @@ -3204,7 +3204,7 @@ sub_02025C48: ; 0x02025C48 mov r0, #1 pop {r3, r4, r5, pc} _02025C7A: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} ; .align 2, 0 diff --git a/asm/unk_02025E68.s b/asm/unk_02025E68.s index cb7242e60b..d89683ad75 100644 --- a/asm/unk_02025E68.s +++ b/asm/unk_02025E68.s @@ -76,7 +76,7 @@ sub_02025EC0: ; 0x02025EC0 bl sub_020021F0 cmp r0, #8 blt _02025ED4 - bl sub_02022974 + bl GF_AssertFail _02025ED4: add r0, r5, #0 add r1, r4, #0 diff --git a/asm/unk_0202602C.s b/asm/unk_0202602C.s index 13bd8ca4ea..e79e6bafae 100644 --- a/asm/unk_0202602C.s +++ b/asm/unk_0202602C.s @@ -166,7 +166,7 @@ sub_0202610C: ; 0x0202610C add r4, r0, #0 cmp r5, #1 blt _0202611A - bl sub_02022974 + bl GF_AssertFail _0202611A: add r0, r4, #0 mov r1, #0xd diff --git a/asm/unk_0202631C.s b/asm/unk_0202631C.s index 67bb66c08e..11cd377d1f 100644 --- a/asm/unk_0202631C.s +++ b/asm/unk_0202631C.s @@ -45,7 +45,7 @@ sub_02026344: ; 0x02026344 cmp r0, r1 bls _02026358 _02026350: - bl sub_02022974 + bl GF_AssertFail mov r0, #1 pop {r3, pc} _02026358: @@ -65,7 +65,7 @@ sub_02026360: ; 0x02026360 bne _0202639E cmp r4, #2 blo _02026374 - bl sub_02022974 + bl GF_AssertFail _02026374: ldr r0, [sp] add r2, r5, #0 @@ -91,7 +91,7 @@ _02026374: _0202639E: cmp r4, #2 blo _020263A6 - bl sub_02022974 + bl GF_AssertFail _020263A6: ldr r0, [sp] add r5, #0x84 @@ -129,7 +129,7 @@ sub_020263D8: ; 0x020263D8 add r7, r3, #0 cmp r4, #2 bls _020263EA - bl sub_02022974 + bl GF_AssertFail _020263EA: cmp r4, #2 bne _020263F0 @@ -227,7 +227,7 @@ sub_02026464: ; 0x02026464 add r1, #0x41 cmp r4, r1 beq _02026488 - bl sub_02022974 + bl GF_AssertFail _02026488: lsl r1, r4, #0x10 add r0, r5, #0 @@ -328,7 +328,7 @@ sub_02026514: ; 0x02026514 add r1, #0x41 cmp r5, r1 beq _0202653A - bl sub_02022974 + bl GF_AssertFail _0202653A: lsl r1, r5, #0x10 add r0, r7, #0 @@ -446,7 +446,7 @@ sub_020265E8: ; 0x020265E8 add r1, #0x41 cmp r5, r1 beq _0202660E - bl sub_02022974 + bl GF_AssertFail _0202660E: lsl r2, r7, #0x18 add r0, r6, #0 @@ -511,7 +511,7 @@ _02026668: lsr r0, r0, #0x18 cmp r0, #2 blo _02026688 - bl sub_02022974 + bl GF_AssertFail _02026688: sub r0, r6, #1 lsl r0, r0, #0x10 @@ -540,7 +540,7 @@ _02026688: lsr r5, r0, #0x10 cmp r6, #2 blo _020266C2 - bl sub_02022974 + bl GF_AssertFail _020266C2: sub r0, r5, #1 lsl r0, r0, #0x10 @@ -581,7 +581,7 @@ sub_020266F8: ; 0x020266F8 add r0, r0, #1 cmp r4, r0 beq _02026710 - bl sub_02022974 + bl GF_AssertFail _02026710: lsl r1, r4, #0x10 add r0, r5, #0 @@ -636,7 +636,7 @@ sub_02026754: ; 0x02026754 add r0, r0, #1 cmp r5, r0 beq _0202676E - bl sub_02022974 + bl GF_AssertFail _0202676E: lsl r1, r5, #0x10 add r0, r6, #0 @@ -694,7 +694,7 @@ sub_020267B8: ; 0x020267B8 add r0, r0, #1 cmp r5, r0 beq _020267D2 - bl sub_02022974 + bl GF_AssertFail _020267D2: lsl r2, r7, #0x18 add r0, r6, #0 @@ -723,7 +723,7 @@ _020267F0: lsr r0, r0, #0x18 cmp r0, #4 blo _0202680C - bl sub_02022974 + bl GF_AssertFail _0202680C: lsl r0, r5, #0x10 lsr r2, r0, #0x10 @@ -774,11 +774,11 @@ sub_02026850: ; 0x02026850 add r6, r1, #0 cmp r4, #4 blo _02026860 - bl sub_02022974 + bl GF_AssertFail _02026860: cmp r6, #0xf bls _02026868 - bl sub_02022974 + bl GF_AssertFail _02026868: cmp r4, #2 bhs _02026878 @@ -929,7 +929,7 @@ sub_02026958: ; 0x02026958 add r5, r1, #0 cmp r5, r0 beq _02026968 - bl sub_02022974 + bl GF_AssertFail _02026968: lsl r1, r5, #0x10 add r0, r4, #0 @@ -974,7 +974,7 @@ sub_020269A4: ; 0x020269A4 add r4, r2, #0 cmp r5, r0 beq _020269B6 - bl sub_02022974 + bl GF_AssertFail _020269B6: lsl r1, r5, #0x10 add r0, r6, #0 @@ -1026,7 +1026,7 @@ sub_02026A00: ; 0x02026A00 add r4, r2, #0 cmp r6, r0 beq _02026A12 - bl sub_02022974 + bl GF_AssertFail _02026A12: lsl r2, r4, #0x18 add r0, r5, #0 @@ -1043,7 +1043,7 @@ _02026A12: bge _02026A58 cmp r4, #7 blo _02026A38 - bl sub_02022974 + bl GF_AssertFail _02026A38: lsl r0, r6, #1 mov r1, #0xc7 @@ -1325,11 +1325,11 @@ sub_02026C24: ; 0x02026C24 add r1, #0x41 cmp r4, r1 beq _02026C4A - bl sub_02022974 + bl GF_AssertFail _02026C4A: cmp r7, #2 blt _02026C52 - bl sub_02022974 + bl GF_AssertFail _02026C52: ldr r0, _02026CC4 ; =0x000001E7 cmp r4, r0 @@ -1406,11 +1406,11 @@ sub_02026CCC: ; 0x02026CCC add r4, r2, #0 cmp r1, r0 beq _02026CDC - bl sub_02022974 + bl GF_AssertFail _02026CDC: cmp r4, #6 blt _02026CE4 - bl sub_02022974 + bl GF_AssertFail _02026CE4: mov r0, #0xc7 lsl r0, r0, #2 @@ -1438,11 +1438,11 @@ sub_02026CFC: ; 0x02026CFC add r0, r0, #1 cmp r4, r0 beq _02026D16 - bl sub_02022974 + bl GF_AssertFail _02026D16: cmp r6, #3 blt _02026D1E - bl sub_02022974 + bl GF_AssertFail _02026D1E: mov r0, #0x67 lsl r0, r0, #2 @@ -1554,7 +1554,7 @@ sub_02026DD0: ; 0x02026DD0 ldr r0, _02026E04 ; =0xBEEFCAFE cmp r1, r0 beq _02026DE0 - bl sub_02022974 + bl GF_AssertFail _02026DE0: ldr r7, _02026E08 ; =0x000001ED mov r5, #0 @@ -1587,7 +1587,7 @@ sub_02026E0C: ; 0x02026E0C ldr r0, _02026E40 ; =0xBEEFCAFE cmp r1, r0 beq _02026E1C - bl sub_02022974 + bl GF_AssertFail _02026E1C: ldr r7, _02026E44 ; =0x000001ED mov r5, #0 @@ -1636,7 +1636,7 @@ sub_02026E64: ; 0x02026E64 ldr r0, _02026EA4 ; =0xBEEFCAFE cmp r1, r0 beq _02026E74 - bl sub_02022974 + bl GF_AssertFail _02026E74: ldr r7, _02026EA8 ; =0x000001ED mov r5, #0 @@ -1674,7 +1674,7 @@ sub_02026EAC: ; 0x02026EAC ldr r0, _02026EEC ; =0xBEEFCAFE cmp r1, r0 beq _02026EBC - bl sub_02022974 + bl GF_AssertFail _02026EBC: ldr r7, _02026EF0 ; =0x000001ED mov r5, #0 @@ -1812,7 +1812,7 @@ sub_02026F9C: ; 0x02026F9C ldr r0, _02026FE4 ; =0xBEEFCAFE cmp r1, r0 beq _02026FAE - bl sub_02022974 + bl GF_AssertFail _02026FAE: add r0, r4, #0 bl sub_02026344 @@ -1855,7 +1855,7 @@ sub_02026FE8: ; 0x02026FE8 ldr r0, _02027028 ; =0xBEEFCAFE cmp r1, r0 beq _02026FFA - bl sub_02022974 + bl GF_AssertFail _02026FFA: add r0, r4, #0 bl sub_02026344 @@ -1894,7 +1894,7 @@ sub_0202702C: ; 0x0202702C ldr r0, _02027054 ; =0xBEEFCAFE cmp r1, r0 beq _0202703E - bl sub_02022974 + bl GF_AssertFail _0202703E: cmp r4, #0 bne _0202704A @@ -1903,7 +1903,7 @@ _0202703E: ldr r6, [r5, r0] b _0202704E _0202704A: - bl sub_02022974 + bl GF_AssertFail _0202704E: add r0, r6, #0 pop {r4, r5, r6, pc} @@ -1921,7 +1921,7 @@ sub_02027058: ; 0x02027058 add r6, r2, #0 cmp r1, r0 beq _0202706C - bl sub_02022974 + bl GF_AssertFail _0202706C: add r0, r4, #0 bl sub_02026344 @@ -1966,7 +1966,7 @@ sub_020270AC: ; 0x020270AC ldr r0, _020270D8 ; =0xBEEFCAFE cmp r1, r0 beq _020270BE - bl sub_02022974 + bl GF_AssertFail _020270BE: add r0, r5, #0 bl sub_02026400 @@ -1993,7 +1993,7 @@ sub_020270DC: ; 0x020270DC ldr r0, _020270F4 ; =0xBEEFCAFE cmp r1, r0 beq _020270EC - bl sub_02022974 + bl GF_AssertFail _020270EC: add r0, r4, #0 bl sub_02026400 @@ -2011,7 +2011,7 @@ sub_020270F8: ; 0x020270F8 ldr r0, _02027128 ; =0xBEEFCAFE cmp r1, r0 beq _0202710A - bl sub_02022974 + bl GF_AssertFail _0202710A: ldr r1, _0202712C ; =0x000001A6 add r0, r5, #0 @@ -2040,7 +2040,7 @@ sub_02027130: ; 0x02027130 ldr r0, _0202714C ; =0xBEEFCAFE cmp r1, r0 beq _02027140 - bl sub_02022974 + bl GF_AssertFail _02027140: ldr r1, _02027150 ; =0x000001A6 add r0, r4, #0 @@ -2060,7 +2060,7 @@ sub_02027154: ; 0x02027154 ldr r0, _02027184 ; =0xBEEFCAFE cmp r1, r0 beq _02027166 - bl sub_02022974 + bl GF_AssertFail _02027166: ldr r1, _02027188 ; =0x000001A7 add r0, r5, #0 @@ -2089,7 +2089,7 @@ sub_0202718C: ; 0x0202718C ldr r0, _020271A8 ; =0xBEEFCAFE cmp r1, r0 beq _0202719C - bl sub_02022974 + bl GF_AssertFail _0202719C: ldr r1, _020271AC ; =0x000001A7 add r0, r4, #0 @@ -2109,7 +2109,7 @@ sub_020271B0: ; 0x020271B0 ldr r0, _020271E4 ; =0xBEEFCAFE cmp r1, r0 beq _020271C2 - bl sub_02022974 + bl GF_AssertFail _020271C2: mov r1, #0x67 add r0, r5, #0 @@ -2139,7 +2139,7 @@ sub_020271E8: ; 0x020271E8 ldr r0, _02027204 ; =0xBEEFCAFE cmp r1, r0 beq _020271F8 - bl sub_02022974 + bl GF_AssertFail _020271F8: mov r1, #0x67 add r0, r4, #0 @@ -2159,7 +2159,7 @@ sub_02027208: ; 0x02027208 ldr r0, _02027238 ; =0xBEEFCAFE cmp r1, r0 beq _0202721A - bl sub_02022974 + bl GF_AssertFail _0202721A: ldr r1, _0202723C ; =0x0000019D add r0, r5, #0 @@ -2188,7 +2188,7 @@ sub_02027240: ; 0x02027240 ldr r0, _0202725C ; =0xBEEFCAFE cmp r1, r0 beq _02027250 - bl sub_02022974 + bl GF_AssertFail _02027250: ldr r1, _02027260 ; =0x0000019D add r0, r4, #0 @@ -2208,7 +2208,7 @@ sub_02027264: ; 0x02027264 ldr r0, _02027284 ; =0xBEEFCAFE cmp r1, r0 beq _02027276 - bl sub_02022974 + bl GF_AssertFail _02027276: lsl r1, r4, #0x18 add r0, r5, #0 @@ -2227,7 +2227,7 @@ sub_02027288: ; 0x02027288 ldr r0, _020272A0 ; =0xBEEFCAFE cmp r1, r0 beq _02027298 - bl sub_02022974 + bl GF_AssertFail _02027298: add r0, r4, #0 bl sub_020268B8 @@ -2260,7 +2260,7 @@ sub_020272A4: ; 0x020272A4 ldr r0, _02027364 ; =0xBEEFCAFE cmp r1, r0 beq _020272DA - bl sub_02022974 + bl GF_AssertFail _020272DA: add r0, r4, #0 bl sub_02026344 @@ -2365,7 +2365,7 @@ sub_0202736C: ; 0x0202736C ldr r0, _0202744C ; =0xBEEFCAFE cmp r1, r0 beq _020273AE - bl sub_02022974 + bl GF_AssertFail _020273AE: add r0, r4, #0 bl sub_02026344 @@ -2459,7 +2459,7 @@ sub_02027454: ; 0x02027454 ldr r0, _0202746C ; =0xBEEFCAFE cmp r1, r0 beq _02027464 - bl sub_02022974 + bl GF_AssertFail _02027464: ldr r0, _02027470 ; =0x0000031B mov r1, #1 @@ -2478,7 +2478,7 @@ sub_02027474: ; 0x02027474 ldr r0, _0202748C ; =0xBEEFCAFE cmp r1, r0 beq _02027484 - bl sub_02022974 + bl GF_AssertFail _02027484: ldr r0, _02027490 ; =0x0000031B ldrb r0, [r4, r0] @@ -2496,7 +2496,7 @@ sub_02027494: ; 0x02027494 ldr r0, _020274AC ; =0xBEEFCAFE cmp r1, r0 beq _020274A4 - bl sub_02022974 + bl GF_AssertFail _020274A4: mov r0, #0xc6 lsl r0, r0, #2 @@ -2514,7 +2514,7 @@ sub_020274B0: ; 0x020274B0 ldr r0, _020274CC ; =0xBEEFCAFE cmp r1, r0 beq _020274C0 - bl sub_02022974 + bl GF_AssertFail _020274C0: mov r0, #0xc6 mov r1, #1 @@ -2533,13 +2533,13 @@ sub_020274D0: ; 0x020274D0 add r4, r1, #0 cmp r6, #8 blo _020274E0 - bl sub_02022974 + bl GF_AssertFail _020274E0: ldr r1, [r5, #0] ldr r0, _02027504 ; =0xBEEFCAFE cmp r1, r0 beq _020274EC - bl sub_02022974 + bl GF_AssertFail _020274EC: add r0, r6, #0 bl sub_020986CC @@ -2583,7 +2583,7 @@ sub_02027520: ; 0x02027520 ldr r0, _02027538 ; =0xBEEFCAFE cmp r1, r0 beq _02027530 - bl sub_02022974 + bl GF_AssertFail _02027530: ldr r0, _0202753C ; =0x0000031A ldrb r0, [r4, r0] @@ -2601,7 +2601,7 @@ sub_02027540: ; 0x02027540 ldr r0, _02027558 ; =0xBEEFCAFE cmp r1, r0 beq _02027550 - bl sub_02022974 + bl GF_AssertFail _02027550: ldr r0, _0202755C ; =0x0000031A mov r1, #1 @@ -2631,7 +2631,7 @@ sub_0202756C: ; 0x0202756C add r4, r2, #0 cmp r1, r0 beq _02027580 - bl sub_02022974 + bl GF_AssertFail _02027580: ldr r1, _020276BC ; =0x000001A6 cmp r5, r1 @@ -2801,7 +2801,7 @@ sub_020276C8: ; 0x020276C8 ldr r0, _0202779C ; =0xBEEFCAFE cmp r1, r0 beq _020276DA - bl sub_02022974 + bl GF_AssertFail _020276DA: ldr r1, _020277A0 ; =0x000001A6 cmp r4, r1 diff --git a/asm/unk_02027B70.s b/asm/unk_02027B70.s index ed3fa01b62..66dba62e4c 100644 --- a/asm/unk_02027B70.s +++ b/asm/unk_02027B70.s @@ -416,7 +416,7 @@ _02027DEA: ; jump table .short _02027E02 - _02027DEA - 2 ; case 4 .short _02027E1A - _02027DEA - 2 ; case 5 _02027DF6: - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} _02027DFC: add r0, r2, #1 diff --git a/asm/unk_02027F50.s b/asm/unk_02027F50.s index 7f24324b12..ec0f6fad5a 100644 --- a/asm/unk_02027F50.s +++ b/asm/unk_02027F50.s @@ -34,7 +34,7 @@ sub_02027F6C: ; 0x02027F6C ldr r0, [r4, #0] cmp r0, r1 beq _02027F7A - bl sub_02022974 + bl GF_AssertFail _02027F7A: add r0, r4, #4 pop {r4, pc} diff --git a/asm/unk_0202854C.s b/asm/unk_0202854C.s index ec03aa37e6..104557f2ac 100644 --- a/asm/unk_0202854C.s +++ b/asm/unk_0202854C.s @@ -474,7 +474,7 @@ _02028840: ldr r0, [sp] cmp r0, #5 blt _02028862 - bl sub_02022974 + bl GF_AssertFail _02028862: add r0, r6, #0 bl sub_02025EF0 @@ -588,11 +588,11 @@ sub_02028938: ; 0x02028938 add r4, r0, #0 cmp r4, #0xb bge _02028944 - bl sub_02022974 + bl GF_AssertFail _02028944: cmp r4, #0x3c blt _0202894C - bl sub_02022974 + bl GF_AssertFail _0202894C: sub r4, #0xb ldr r0, _02028958 ; =0x02100920 @@ -686,7 +686,7 @@ sub_020289C4: ; 0x020289C4 bl sub_02028AFC cmp r0, #0 beq _020289D6 - bl sub_02022974 + bl GF_AssertFail _020289D6: mov r0, #0x81 add r1, r5, r4 @@ -830,11 +830,11 @@ sub_02028ACC: ; 0x02028ACC add r4, r1, #0 cmp r6, #1 bge _02028ADC - bl sub_02022974 + bl GF_AssertFail _02028ADC: cmp r6, #0xf ble _02028AE4 - bl sub_02022974 + bl GF_AssertFail _02028AE4: sub r0, r6, #1 add r1, r5, r0 @@ -1483,7 +1483,7 @@ sub_02028EF8: ; 0x02028EF8 add r6, r3, #0 cmp r4, #0x40 blt _02028F0A - bl sub_02022974 + bl GF_AssertFail _02028F0A: ldr r0, _02028F3C ; =0x0000010F add r1, r5, r4 @@ -1520,7 +1520,7 @@ sub_02028F40: ; 0x02028F40 add r5, r0, #0 cmp r4, #0x40 blt _02028F4E - bl sub_02022974 + bl GF_AssertFail _02028F4E: ldr r0, _02028F58 ; =0x0000010F add r1, r5, r4 @@ -1537,7 +1537,7 @@ sub_02028F5C: ; 0x02028F5C add r5, r0, #0 cmp r4, #0x40 blt _02028F6A - bl sub_02022974 + bl GF_AssertFail _02028F6A: lsl r0, r4, #1 add r0, r4, r0 @@ -1563,7 +1563,7 @@ sub_02028F88: ; 0x02028F88 add r5, r0, #0 cmp r4, #0x40 blt _02028F96 - bl sub_02022974 + bl GF_AssertFail _02028F96: lsl r0, r4, #1 add r0, r4, r0 @@ -1589,7 +1589,7 @@ sub_02028FB4: ; 0x02028FB4 add r5, r0, #0 cmp r4, #0x40 blt _02028FC2 - bl sub_02022974 + bl GF_AssertFail _02028FC2: ldr r0, _02028FDC ; =0x0000010F mov r1, #0 @@ -1616,7 +1616,7 @@ sub_02028FE0: ; 0x02028FE0 add r6, r3, #0 cmp r4, #0x10 blt _02028FF2 - bl sub_02022974 + bl GF_AssertFail _02028FF2: lsl r2, r4, #1 ldr r1, _0202902C ; =0x0000050C @@ -1717,7 +1717,7 @@ sub_02029088: ; 0x02029088 add r7, r3, #0 cmp r4, #0x64 blt _0202909A - bl sub_02022974 + bl GF_AssertFail _0202909A: ldr r1, _020290D4 ; =0x0000055C add r0, r5, r4 @@ -1885,7 +1885,7 @@ sub_020291A4: ; 0x020291A4 add r5, r0, #0 cmp r4, #0xff blt _020291B2 - bl sub_02022974 + bl GF_AssertFail _020291B2: ldr r0, _020291C8 ; =0x0000020F mov r2, #3 @@ -2118,20 +2118,20 @@ sub_02029308: ; 0x02029308 add r6, r3, #0 cmp r4, #0x20 blt _0202931A - bl sub_02022974 + bl GF_AssertFail _0202931A: cmp r6, #0x20 blt _02029322 - bl sub_02022974 + bl GF_AssertFail _02029322: ldr r0, [sp, #0x18] cmp r0, #0x20 blt _0202932C - bl sub_02022974 + bl GF_AssertFail _0202932C: cmp r5, #0 bne _02029334 - bl sub_02022974 + bl GF_AssertFail _02029334: cmp r4, #0 beq _02029360 @@ -2216,7 +2216,7 @@ sub_020293B0: ; 0x020293B0 add r4, r0, #0 cmp r5, #0x20 blt _020293BE - bl sub_02022974 + bl GF_AssertFail _020293BE: cmp r5, #0 bne _020293CA @@ -2260,7 +2260,7 @@ sub_020293FC: ; 0x020293FC add r4, r0, #0 cmp r5, #0x20 blt _0202940A - bl sub_02022974 + bl GF_AssertFail _0202940A: cmp r5, #0 bne _02029412 @@ -2290,7 +2290,7 @@ sub_0202942C: ; 0x0202942C add r4, r0, #0 cmp r5, #0x20 blt _0202943A - bl sub_02022974 + bl GF_AssertFail _0202943A: cmp r5, #0 bne _02029442 diff --git a/asm/unk_020298BC.s b/asm/unk_020298BC.s index 50afa622cf..31893a9ec0 100644 --- a/asm/unk_020298BC.s +++ b/asm/unk_020298BC.s @@ -44,20 +44,20 @@ sub_020298D8: ; 0x020298D8 lsl r0, r0, #8 cmp r1, r0 blt _02029902 - bl sub_02022974 + bl GF_AssertFail _02029902: mov r0, #1 ldr r1, [sp] lsl r0, r0, #8 cmp r1, r0 blt _02029910 - bl sub_02022974 + bl GF_AssertFail _02029910: mov r0, #0x7f mvn r0, r0 cmp r4, r0 bgt _0202991C - bl sub_02022974 + bl GF_AssertFail _0202991C: ldr r0, [sp, #4] strb r0, [r5] @@ -214,7 +214,7 @@ sub_02029A2C: ; 0x02029A2C add r6, r1, #0 cmp r4, #0x3d blo _02029A3C - bl sub_02022974 + bl GF_AssertFail _02029A3C: lsr r2, r4, #0x1f lsl r1, r4, #0x1d @@ -251,7 +251,7 @@ sub_02029A70: ; 0x02029A70 add r5, r0, #0 cmp r4, #0x3d blo _02029A7E - bl sub_02022974 + bl GF_AssertFail _02029A7E: lsr r3, r4, #0x1f lsl r2, r4, #0x1d @@ -289,7 +289,7 @@ sub_02029AB0: ; 0x02029AB0 add r6, r2, #0 cmp r4, #2 blo _02029AC0 - bl sub_02022974 + bl GF_AssertFail _02029AC0: lsr r2, r6, #0x1f lsl r1, r6, #0x1b @@ -349,7 +349,7 @@ sub_02029B18: ; 0x02029B18 add r6, r2, #0 cmp r4, #0x12 bls _02029B28 - bl sub_02022974 + bl GF_AssertFail _02029B28: lsr r2, r6, #0x1f lsl r1, r6, #0x1e @@ -587,7 +587,7 @@ sub_02029CA8: ; 0x02029CA8 add r5, r0, #0 cmp r6, #0xb blt _02029CB6 - bl sub_02022974 + bl GF_AssertFail _02029CB6: mov r0, #0x74 add r4, r6, #0 @@ -596,7 +596,7 @@ _02029CB6: bl sub_020298BC cmp r0, #0 bne _02029CCA - bl sub_02022974 + bl GF_AssertFail _02029CCA: add r0, r5, r4 pop {r4, r5, r6, pc} @@ -610,7 +610,7 @@ sub_02029CD0: ; 0x02029CD0 add r5, r0, #0 cmp r6, #5 blt _02029CDE - bl sub_02022974 + bl GF_AssertFail _02029CDE: mov r0, #0x98 add r4, r6, #0 @@ -621,7 +621,7 @@ _02029CDE: bl sub_020298BC cmp r0, #0 bne _02029CF6 - bl sub_02022974 + bl GF_AssertFail _02029CF6: ldr r0, _02029D00 ; =0x000004FC add r0, r5, r0 @@ -647,7 +647,7 @@ sub_02029D10: ; 0x02029D10 add r5, r0, #0 cmp r4, #0xb blt _02029D1E - bl sub_02022974 + bl GF_AssertFail _02029D1E: mov r0, #0x74 mul r0, r4 @@ -664,7 +664,7 @@ sub_02029D2C: ; 0x02029D2C add r5, r0, #0 cmp r4, #5 blt _02029D3A - bl sub_02022974 + bl GF_AssertFail _02029D3A: ldr r0, _02029D4C ; =0x000004FC add r1, r5, r0 @@ -726,7 +726,7 @@ sub_02029D94: ; 0x02029D94 add r4, r0, #0 cmp r5, #0x64 blo _02029DA2 - bl sub_02022974 + bl GF_AssertFail _02029DA2: add r0, r5, #0 bl sub_02029BA4 @@ -740,7 +740,7 @@ _02029DA2: _02029DB8: cmp r5, #0x3d bhs _02029DC0 - bl sub_02022974 + bl GF_AssertFail _02029DC0: sub r5, #0x3d lsl r0, r5, #0x18 @@ -760,7 +760,7 @@ sub_02029DD4: ; 0x02029DD4 add r5, r0, #0 cmp r4, #0x12 blo _02029DE2 - bl sub_02022974 + bl GF_AssertFail _02029DE2: add r5, #0x28 lsl r1, r4, #0x18 @@ -817,7 +817,7 @@ sub_02029E2C: ; 0x02029E2C add r6, r2, #0 cmp r4, #0x64 blo _02029E3C - bl sub_02022974 + bl GF_AssertFail _02029E3C: add r0, r4, #0 bl sub_02029BA4 @@ -854,7 +854,7 @@ _02029E68: _02029E80: cmp r4, #0x3d bhs _02029E88 - bl sub_02022974 + bl GF_AssertFail _02029E88: sub r4, #0x3d lsl r0, r4, #0x18 @@ -877,7 +877,7 @@ sub_02029EA0: ; 0x02029EA0 add r6, r2, #0 cmp r4, #0x64 blo _02029EB0 - bl sub_02022974 + bl GF_AssertFail _02029EB0: add r0, r4, #0 bl sub_02029BA4 @@ -904,7 +904,7 @@ _02029ED2: _02029EDE: cmp r4, #0x3d bhs _02029EE6 - bl sub_02022974 + bl GF_AssertFail _02029EE6: sub r4, #0x3d lsl r0, r4, #0x18 @@ -925,7 +925,7 @@ sub_02029EFC: ; 0x02029EFC add r5, r0, #0 cmp r4, #0x12 blo _02029F0A - bl sub_02022974 + bl GF_AssertFail _02029F0A: add r0, r5, #0 lsl r1, r4, #0x18 @@ -956,7 +956,7 @@ sub_02029F34: ; 0x02029F34 bl sub_020298BC cmp r0, #0 bne _02029F46 - bl sub_02022974 + bl GF_AssertFail _02029F46: ldr r1, [r4, #0] ldr r0, _02029F58 ; =0x00002345 @@ -979,7 +979,7 @@ sub_02029F5C: ; 0x02029F5C bl sub_020298BC cmp r0, #0 bne _02029F6E - bl sub_02022974 + bl GF_AssertFail _02029F6E: ldr r0, _02029F7C ; =0x00002345 str r0, [r4, #0] @@ -1001,7 +1001,7 @@ sub_02029F84: ; 0x02029F84 bl sub_020298BC cmp r0, #0 bne _02029F96 - bl sub_02022974 + bl GF_AssertFail _02029F96: add r0, r4, #0 mov r1, #0 @@ -1024,7 +1024,7 @@ sub_02029FAC: ; 0x02029FAC bl sub_020298BC cmp r0, #0 bne _02029FC2 - bl sub_02022974 + bl GF_AssertFail _02029FC2: add r0, r5, #4 add r1, r4, #0 @@ -1056,7 +1056,7 @@ sub_02029FD0: ; 0x02029FD0 add r7, r0, #0 cmp r6, #0xa blt _0202A000 - bl sub_02022974 + bl GF_AssertFail _0202A000: add r1, sp, #0xc mov r0, #4 @@ -1064,7 +1064,7 @@ _0202A000: add r0, #0xfc cmp r1, r0 blt _0202A010 - bl sub_02022974 + bl GF_AssertFail _0202A010: add r0, sp, #0xc mov r1, #6 @@ -1074,13 +1074,13 @@ _0202A010: ldr r0, [sp, #8] cmp r0, r1 blt _0202A024 - bl sub_02022974 + bl GF_AssertFail _0202A024: mov r0, #0x7f mvn r0, r0 cmp r7, r0 bgt _0202A030 - bl sub_02022974 + bl GF_AssertFail _0202A030: mov r0, #1 lsl r0, r6 @@ -1088,13 +1088,13 @@ _0202A030: str r0, [sp, #4] tst r0, r1 beq _0202A040 - bl sub_02022974 + bl GF_AssertFail _0202A040: ldr r0, [r5, #0] bl sub_020298BC cmp r0, #0 bne _0202A04E - bl sub_02022974 + bl GF_AssertFail _0202A04E: lsl r0, r7, #0x18 lsr r0, r0, #0x18 @@ -1133,7 +1133,7 @@ sub_0202A084: ; 0x0202A084 bl sub_020298BC cmp r0, #0 bne _0202A098 - bl sub_02022974 + bl GF_AssertFail _0202A098: add r5, #0x70 strb r4, [r5] @@ -1150,7 +1150,7 @@ sub_0202A0A0: ; 0x0202A0A0 bl sub_020298BC cmp r0, #0 bne _0202A0B4 - bl sub_02022974 + bl GF_AssertFail _0202A0B4: add r0, r5, #0 add r0, #0x40 @@ -1173,7 +1173,7 @@ sub_0202A0CC: ; 0x0202A0CC bl sub_020298BC cmp r0, #0 bne _0202A0E0 - bl sub_02022974 + bl GF_AssertFail _0202A0E0: add r0, r5, #0 add r1, r4, #0 @@ -1192,7 +1192,7 @@ sub_0202A0EC: ; 0x0202A0EC bl sub_020298BC cmp r0, #0 bne _0202A102 - bl sub_02022974 + bl GF_AssertFail _0202A102: add r0, r5, #4 add r1, r4, #0 @@ -1209,13 +1209,13 @@ sub_0202A110: ; 0x0202A110 add r5, r0, #0 cmp r4, #0xa blt _0202A11E - bl sub_02022974 + bl GF_AssertFail _0202A11E: ldr r0, [r5, #0] bl sub_020298BC cmp r0, #0 bne _0202A12C - bl sub_02022974 + bl GF_AssertFail _0202A12C: mov r0, #1 ldr r1, [r5, #0x3c] @@ -1233,7 +1233,7 @@ sub_0202A138: ; 0x0202A138 bl sub_020298BC cmp r0, #0 bne _0202A14A - bl sub_02022974 + bl GF_AssertFail _0202A14A: add r0, r4, #4 pop {r4, pc} @@ -1247,20 +1247,20 @@ sub_0202A150: ; 0x0202A150 add r5, r0, #0 cmp r4, #0xa blt _0202A15E - bl sub_02022974 + bl GF_AssertFail _0202A15E: mov r0, #1 ldr r1, [r5, #0x3c] lsl r0, r4 tst r0, r1 bne _0202A16C - bl sub_02022974 + bl GF_AssertFail _0202A16C: ldr r0, [r5, #0] bl sub_020298BC cmp r0, #0 bne _0202A17A - bl sub_02022974 + bl GF_AssertFail _0202A17A: add r5, #0x48 lsl r0, r4, #2 @@ -1277,7 +1277,7 @@ sub_0202A184: ; 0x0202A184 bl sub_020298BC cmp r0, #0 bne _0202A196 - bl sub_02022974 + bl GF_AssertFail _0202A196: add r0, r4, #4 bl sub_0202A5E8 @@ -1294,7 +1294,7 @@ sub_0202A1A0: ; 0x0202A1A0 bl sub_020298BC cmp r0, #0 bne _0202A1B4 - bl sub_02022974 + bl GF_AssertFail _0202A1B4: add r0, r5, #4 add r1, r4, #0 @@ -1311,7 +1311,7 @@ sub_0202A1C0: ; 0x0202A1C0 bl sub_020298BC cmp r0, #0 bne _0202A1D2 - bl sub_02022974 + bl GF_AssertFail _0202A1D2: add r0, r4, #4 bl sub_0202A5FC @@ -1327,7 +1327,7 @@ sub_0202A1DC: ; 0x0202A1DC bl sub_020298BC cmp r0, #0 bne _0202A1EE - bl sub_02022974 + bl GF_AssertFail _0202A1EE: add r4, #0x70 ldrb r0, [r4] @@ -1352,7 +1352,7 @@ sub_0202A200: ; 0x0202A200 bl sub_020298BC cmp r0, #0 bne _0202A212 - bl sub_02022974 + bl GF_AssertFail _0202A212: add r4, #0x71 ldrb r0, [r4] @@ -1367,7 +1367,7 @@ sub_0202A218: ; 0x0202A218 bl sub_020298BC cmp r0, #0 bne _0202A22A - bl sub_02022974 + bl GF_AssertFail _0202A22A: ldr r1, [r4, #0] ldr r0, _0202A23C ; =0x00002345 @@ -1390,7 +1390,7 @@ sub_0202A240: ; 0x0202A240 bl sub_020298BC cmp r0, #0 bne _0202A252 - bl sub_02022974 + bl GF_AssertFail _0202A252: ldr r0, _0202A258 ; =0x00002345 str r0, [r4, #0] @@ -1407,7 +1407,7 @@ sub_0202A25C: ; 0x0202A25C bl sub_020298BC cmp r0, #0 bne _0202A26E - bl sub_02022974 + bl GF_AssertFail _0202A26E: add r0, r4, #0 mov r1, #0 @@ -1430,7 +1430,7 @@ sub_0202A284: ; 0x0202A284 bl sub_020298BC cmp r0, #0 bne _0202A29A - bl sub_02022974 + bl GF_AssertFail _0202A29A: add r5, #8 add r0, r5, #0 @@ -1462,7 +1462,7 @@ sub_0202A2A8: ; 0x0202A2A8 add r7, r0, #0 cmp r6, #0x14 blt _0202A2D8 - bl sub_02022974 + bl GF_AssertFail _0202A2D8: add r1, sp, #0xc mov r0, #4 @@ -1470,7 +1470,7 @@ _0202A2D8: add r0, #0xfc cmp r1, r0 blt _0202A2E8 - bl sub_02022974 + bl GF_AssertFail _0202A2E8: add r0, sp, #0xc mov r1, #6 @@ -1480,13 +1480,13 @@ _0202A2E8: ldr r0, [sp, #8] cmp r0, r1 blt _0202A2FC - bl sub_02022974 + bl GF_AssertFail _0202A2FC: mov r0, #0x7f mvn r0, r0 cmp r7, r0 bgt _0202A308 - bl sub_02022974 + bl GF_AssertFail _0202A308: mov r0, #1 lsl r0, r6 @@ -1494,13 +1494,13 @@ _0202A308: str r0, [sp, #4] tst r0, r1 beq _0202A318 - bl sub_02022974 + bl GF_AssertFail _0202A318: ldr r0, [r5, #0] bl sub_020298BC cmp r0, #0 bne _0202A326 - bl sub_02022974 + bl GF_AssertFail _0202A326: lsl r0, r7, #0x18 lsr r0, r0, #0x18 @@ -1539,7 +1539,7 @@ sub_0202A35C: ; 0x0202A35C bl sub_020298BC cmp r0, #0 bne _0202A370 - bl sub_02022974 + bl GF_AssertFail _0202A370: add r5, #0x94 strb r4, [r5] @@ -1556,7 +1556,7 @@ sub_0202A378: ; 0x0202A378 bl sub_020298BC cmp r0, #0 bne _0202A38C - bl sub_02022974 + bl GF_AssertFail _0202A38C: str r4, [r5, #4] pop {r3, r4, r5, pc} @@ -1571,7 +1571,7 @@ sub_0202A390: ; 0x0202A390 bl sub_020298BC cmp r0, #0 bne _0202A3A4 - bl sub_02022974 + bl GF_AssertFail _0202A3A4: add r0, r5, #0 add r1, r4, #0 @@ -1591,7 +1591,7 @@ sub_0202A3B0: ; 0x0202A3B0 bl sub_020298BC cmp r0, #0 bne _0202A3C8 - bl sub_02022974 + bl GF_AssertFail _0202A3C8: add r1, sp, #4 add r0, r4, #0 @@ -1622,18 +1622,18 @@ sub_0202A3EC: ; 0x0202A3EC ldr r4, [sp, #0x24] cmp r6, #0x14 blo _0202A402 - bl sub_02022974 + bl GF_AssertFail _0202A402: cmp r7, #0x64 blo _0202A40A - bl sub_02022974 + bl GF_AssertFail _0202A40A: mov r1, #1 ldr r0, [sp, #4] lsl r1, r1, #8 cmp r0, r1 blt _0202A418 - bl sub_02022974 + bl GF_AssertFail _0202A418: add r0, sp, #0x10 ldrb r1, [r0, #0x10] @@ -1641,13 +1641,13 @@ _0202A418: lsl r0, r0, #8 cmp r1, r0 blt _0202A428 - bl sub_02022974 + bl GF_AssertFail _0202A428: mov r0, #0x7f mvn r0, r0 cmp r4, r0 bgt _0202A434 - bl sub_02022974 + bl GF_AssertFail _0202A434: mov r0, #1 lsl r0, r6 @@ -1655,13 +1655,13 @@ _0202A434: str r0, [sp, #8] tst r0, r1 beq _0202A444 - bl sub_02022974 + bl GF_AssertFail _0202A444: ldr r0, [r5, #0] bl sub_020298BC cmp r0, #0 bne _0202A452 - bl sub_02022974 + bl GF_AssertFail _0202A452: mov r0, #0x38 ldrsb r0, [r5, r0] @@ -1699,13 +1699,13 @@ sub_0202A488: ; 0x0202A488 add r5, r0, #0 cmp r4, #0x14 blt _0202A496 - bl sub_02022974 + bl GF_AssertFail _0202A496: ldr r0, [r5, #0] bl sub_020298BC cmp r0, #0 bne _0202A4A4 - bl sub_02022974 + bl GF_AssertFail _0202A4A4: mov r0, #1 add r1, r0, #0 @@ -1728,7 +1728,7 @@ sub_0202A4B4: ; 0x0202A4B4 bl sub_020298BC cmp r0, #0 bne _0202A4CA - bl sub_02022974 + bl GF_AssertFail _0202A4CA: add r5, #8 add r0, r5, #0 @@ -1746,7 +1746,7 @@ sub_0202A4D8: ; 0x0202A4D8 bl sub_020298BC cmp r0, #0 bne _0202A4EA - bl sub_02022974 + bl GF_AssertFail _0202A4EA: add r4, #8 add r0, r4, #0 @@ -1760,20 +1760,20 @@ sub_0202A4F0: ; 0x0202A4F0 add r5, r0, #0 cmp r4, #0x14 blt _0202A4FE - bl sub_02022974 + bl GF_AssertFail _0202A4FE: mov r0, #1 ldr r1, [r5, #0x40] lsl r0, r4 tst r0, r1 bne _0202A50C - bl sub_02022974 + bl GF_AssertFail _0202A50C: ldr r0, [r5, #0] bl sub_020298BC cmp r0, #0 bne _0202A51A - bl sub_02022974 + bl GF_AssertFail _0202A51A: add r5, #0x44 lsl r0, r4, #2 @@ -1791,7 +1791,7 @@ sub_0202A524: ; 0x0202A524 bl sub_020298BC cmp r0, #0 bne _0202A538 - bl sub_02022974 + bl GF_AssertFail _0202A538: add r5, #8 add r0, r5, #0 @@ -1808,7 +1808,7 @@ sub_0202A544: ; 0x0202A544 bl sub_020298BC cmp r0, #0 bne _0202A556 - bl sub_02022974 + bl GF_AssertFail _0202A556: add r4, #8 add r0, r4, #0 @@ -1825,7 +1825,7 @@ sub_0202A560: ; 0x0202A560 bl sub_020298BC cmp r0, #0 bne _0202A574 - bl sub_02022974 + bl GF_AssertFail _0202A574: add r5, #8 add r0, r5, #0 @@ -1841,20 +1841,20 @@ sub_0202A580: ; 0x0202A580 add r5, r0, #0 cmp r4, #0x14 blt _0202A58E - bl sub_02022974 + bl GF_AssertFail _0202A58E: mov r0, #1 ldr r1, [r5, #0x40] lsl r0, r4 tst r0, r1 bne _0202A59C - bl sub_02022974 + bl GF_AssertFail _0202A59C: ldr r0, [r5, #0] bl sub_020298BC cmp r0, #0 bne _0202A5AA - bl sub_02022974 + bl GF_AssertFail _0202A5AA: add r5, #0x44 lsl r0, r4, #2 @@ -1872,7 +1872,7 @@ sub_0202A5B8: ; 0x0202A5B8 bl sub_020298BC cmp r0, #0 bne _0202A5CA - bl sub_02022974 + bl GF_AssertFail _0202A5CA: add r4, #0x94 ldrb r0, [r4] @@ -1887,7 +1887,7 @@ sub_0202A5D0: ; 0x0202A5D0 bl sub_020298BC cmp r0, #0 bne _0202A5E2 - bl sub_02022974 + bl GF_AssertFail _0202A5E2: ldr r0, [r4, #4] pop {r4, pc} diff --git a/asm/unk_0202ACE0.s b/asm/unk_0202ACE0.s index 57ec5e871a..5217521800 100644 --- a/asm/unk_0202ACE0.s +++ b/asm/unk_0202ACE0.s @@ -62,7 +62,7 @@ sub_0202AD2C: ; 0x0202AD2C add r7, r2, #0 cmp r4, #0x20 blt _0202AD3C - bl sub_02022974 + bl GF_AssertFail _0202AD3C: cmp r7, #0xc bhi _0202AE0C @@ -204,7 +204,7 @@ sub_0202AE2C: ; 0x0202AE2C add r6, r3, #0 cmp r4, #0x20 blt _0202AE3E - bl sub_02022974 + bl GF_AssertFail _0202AE3E: cmp r7, #9 bhi _0202AEC4 @@ -234,13 +234,13 @@ _0202AE62: str r6, [r1, r0] pop {r3, r4, r5, r6, r7, pc} _0202AE70: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _0202AE76: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _0202AE7C: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _0202AE82: mov r0, #0x38 @@ -279,7 +279,7 @@ _0202AEB4: strb r6, [r1, r0] pop {r3, r4, r5, r6, r7, pc} _0202AEC0: - bl sub_02022974 + bl GF_AssertFail _0202AEC4: pop {r3, r4, r5, r6, r7, pc} nop @@ -296,7 +296,7 @@ sub_0202AED8: ; 0x0202AED8 add r5, r0, #0 cmp r4, #0x20 blt _0202AEE6 - bl sub_02022974 + bl GF_AssertFail _0202AEE6: mov r0, #0xc add r5, #0x40 @@ -312,7 +312,7 @@ sub_0202AEF0: ; 0x0202AEF0 add r5, r0, #0 cmp r4, #0x20 blt _0202AEFE - bl sub_02022974 + bl GF_AssertFail _0202AEFE: mov r0, #0x1d lsl r0, r0, #4 @@ -331,7 +331,7 @@ sub_0202AF0C: ; 0x0202AF0C add r6, r2, #0 cmp r4, #0x20 blt _0202AF1C - bl sub_02022974 + bl GF_AssertFail _0202AF1C: mov r1, #0x1d lsl r1, r1, #4 @@ -353,7 +353,7 @@ sub_0202AF34: ; 0x0202AF34 add r5, r0, #0 cmp r4, #0x20 blt _0202AF42 - bl sub_02022974 + bl GF_AssertFail _0202AF42: mov r0, #7 lsl r0, r0, #6 @@ -372,7 +372,7 @@ sub_0202AF50: ; 0x0202AF50 add r6, r2, #0 cmp r4, #0x20 blt _0202AF60 - bl sub_02022974 + bl GF_AssertFail _0202AF60: mov r1, #7 lsl r1, r1, #6 @@ -394,7 +394,7 @@ sub_0202AF78: ; 0x0202AF78 add r5, r0, #0 cmp r4, #0x20 blt _0202AF86 - bl sub_02022974 + bl GF_AssertFail _0202AF86: mov r0, #0xc add r5, #0x40 @@ -454,7 +454,7 @@ sub_0202AFD4: ; 0x0202AFD4 str r0, [sp] cmp r5, #0x20 blt _0202AFE4 - bl sub_02022974 + bl GF_AssertFail _0202AFE4: cmp r5, #0x1f bge _0202B03E diff --git a/asm/unk_0202B594.s b/asm/unk_0202B594.s index 8c15ae7f35..260e62d63c 100644 --- a/asm/unk_0202B594.s +++ b/asm/unk_0202B594.s @@ -22,7 +22,7 @@ sub_0202B59C: ; 0x0202B59C add r4, r1, #0 cmp r4, r0 bls _0202B5AC - bl sub_02022974 + bl GF_AssertFail _0202B5AC: strh r4, [r5] pop {r3, r4, r5, pc} diff --git a/asm/unk_0202C858.s b/asm/unk_0202C858.s index 7cad8e4106..1a4a7391dd 100644 --- a/asm/unk_0202C858.s +++ b/asm/unk_0202C858.s @@ -50,11 +50,11 @@ sub_0202C88C: ; 0x0202C88C add r4, r2, #0 cmp r5, r0 blt _0202C8A0 - bl sub_02022974 + bl GF_AssertFail _0202C8A0: cmp r4, #0x40 blt _0202C8A8 - bl sub_02022974 + bl GF_AssertFail _0202C8A8: strb r5, [r6, #5] add r0, r6, #0 @@ -90,11 +90,11 @@ sub_0202C8C8: ; 0x0202C8C8 add r4, r2, #0 cmp r5, r0 blt _0202C8DC - bl sub_02022974 + bl GF_AssertFail _0202C8DC: cmp r4, #0x40 blt _0202C8E4 - bl sub_02022974 + bl GF_AssertFail _0202C8E4: cmp r5, #0 bne _0202C8EC @@ -134,17 +134,17 @@ sub_0202C918: ; 0x0202C918 str r3, [sp] cmp r3, #4 blt _0202C92A - bl sub_02022974 + bl GF_AssertFail _0202C92A: mov r0, #1 lsl r0, r0, #8 cmp r5, r0 blt _0202C936 - bl sub_02022974 + bl GF_AssertFail _0202C936: cmp r4, #0x40 blt _0202C93E - bl sub_02022974 + bl GF_AssertFail _0202C93E: cmp r5, #0 beq _0202C98C diff --git a/asm/unk_0202C9F4.s b/asm/unk_0202C9F4.s index 4e25a30f63..106c170e53 100644 --- a/asm/unk_0202C9F4.s +++ b/asm/unk_0202C9F4.s @@ -51,7 +51,7 @@ sub_0202CA28: ; 0x0202CA28 add r5, r0, #0 cmp r4, #0xc blt _0202CA36 - bl sub_02022974 + bl GF_AssertFail _0202CA36: mov r0, #0x18 mul r0, r4 @@ -68,7 +68,7 @@ sub_0202CA40: ; 0x0202CA40 add r4, r1, #0 cmp r6, #0xc blt _0202CA50 - bl sub_02022974 + bl GF_AssertFail _0202CA50: add r0, r5, #0 add r1, r6, #0 @@ -87,7 +87,7 @@ sub_0202CA64: ; 0x0202CA64 add r5, r0, #0 cmp r4, #8 blt _0202CA72 - bl sub_02022974 + bl GF_AssertFail _0202CA72: lsl r0, r4, #1 add r0, r4, r0 diff --git a/asm/unk_0202CD50.s b/asm/unk_0202CD50.s index 78c24622f2..625ee35a4b 100644 --- a/asm/unk_0202CD50.s +++ b/asm/unk_0202CD50.s @@ -112,7 +112,7 @@ _0202CDEC: ldrh r0, [r1, r0] pop {r3, pc} _0202CDFE: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -140,7 +140,7 @@ _0202CE18: strh r2, [r1, r0] b _0202CE30 _0202CE2C: - bl sub_02022974 + bl GF_AssertFail _0202CE30: add r0, r5, #0 add r1, r4, #0 @@ -176,7 +176,7 @@ _0202CE62: ldr r0, _0202CE80 ; =0x0000270F pop {r3, pc} _0202CE66: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} nop @@ -381,7 +381,7 @@ sub_0202CFEC: ; 0x0202CFEC add r5, r0, #0 cmp r6, #0x33 blt _0202CFFA - bl sub_02022974 + bl GF_AssertFail _0202CFFA: add r0, r5, #0 mov r1, #1 diff --git a/asm/unk_0202D05C.s b/asm/unk_0202D05C.s index b1c380c88b..39fac4d77b 100644 --- a/asm/unk_0202D05C.s +++ b/asm/unk_0202D05C.s @@ -606,7 +606,7 @@ sub_0202D414: ; 0x0202D414 mov r3, #1 cmp r1, #0x10 blo _0202D424 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} _0202D424: diff --git a/asm/unk_0202D7A8.s b/asm/unk_0202D7A8.s index d3a514b22b..f42219b62b 100644 --- a/asm/unk_0202D7A8.s +++ b/asm/unk_0202D7A8.s @@ -83,7 +83,7 @@ _0202D824: ldr r0, [r0, #4] pop {r3, pc} _0202D828: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} thumb_func_end sub_0202D814 @@ -210,7 +210,7 @@ sub_0202D8C4: ; 0x0202D8C4 add r5, r0, #0 cmp r4, #6 blo _0202D8D2 - bl sub_02022974 + bl GF_AssertFail _0202D8D2: mov r0, #0x52 add r1, r5, r4 @@ -227,7 +227,7 @@ sub_0202D8DC: ; 0x0202D8DC add r6, r2, #0 cmp r4, #6 blo _0202D8EC - bl sub_02022974 + bl GF_AssertFail _0202D8EC: mov r0, #0x52 add r1, r5, r4 @@ -244,7 +244,7 @@ sub_0202D8F8: ; 0x0202D8F8 add r5, r0, #0 cmp r4, #6 blo _0202D906 - bl sub_02022974 + bl GF_AssertFail _0202D906: mov r0, #0x14 mul r0, r4 @@ -275,7 +275,7 @@ sub_0202D924: ; 0x0202D924 add r5, r0, #0 cmp r4, #6 blo _0202D932 - bl sub_02022974 + bl GF_AssertFail _0202D932: mov r0, #0x14 add r5, #0xd0 @@ -419,7 +419,7 @@ sub_0202D9EC: ; 0x0202D9EC add r5, r0, #0 cmp r4, #2 bls _0202D9FA - bl sub_02022974 + bl GF_AssertFail _0202D9FA: ldr r0, _0202DA00 ; =0x00000151 strb r4, [r5, r0] @@ -458,7 +458,7 @@ sub_0202DA24: ; 0x0202DA24 add r4, r0, #0 cmp r5, #0x10 blo _0202DA36 - bl sub_02022974 + bl GF_AssertFail _0202DA36: ldrh r0, [r4, #0xc] strh r0, [r4, #0xe] diff --git a/asm/unk_0202DAB4.s b/asm/unk_0202DAB4.s index 9a3bac04c0..86095aa431 100644 --- a/asm/unk_0202DAB4.s +++ b/asm/unk_0202DAB4.s @@ -243,7 +243,7 @@ sub_0202DC48: ; 0x0202DC48 add r4, r0, #0 cmp r5, #8 blt _0202DC56 - bl sub_02022974 + bl GF_AssertFail _0202DC56: lsl r0, r5, #6 add r0, r5, r0 @@ -272,7 +272,7 @@ sub_0202DC7C: ; 0x0202DC7C add r5, r0, #0 cmp r4, #3 blt _0202DC8A - bl sub_02022974 + bl GF_AssertFail _0202DC8A: mov r0, #0xd6 lsl r0, r0, #2 @@ -303,7 +303,7 @@ sub_0202DCB8: ; 0x0202DCB8 add r5, r0, #0 cmp r4, #3 blt _0202DCC6 - bl sub_02022974 + bl GF_AssertFail _0202DCC6: mov r0, #0xd6 lsl r0, r0, #2 @@ -376,7 +376,7 @@ sub_0202DD30: ; 0x0202DD30 add r5, r0, #0 cmp r4, #8 blt _0202DD3E - bl sub_02022974 + bl GF_AssertFail _0202DD3E: lsl r0, r4, #6 add r0, r4, r0 @@ -402,7 +402,7 @@ sub_0202DD5C: ; 0x0202DD5C add r5, r0, #0 cmp r4, #3 blt _0202DD6A - bl sub_02022974 + bl GF_AssertFail _0202DD6A: mov r0, #0xd6 lsl r0, r0, #2 @@ -525,7 +525,7 @@ sub_0202DE2C: ; 0x0202DE2C lsl r0, r0, #0xa cmp r4, r0 blt _0202DE3E - bl sub_02022974 + bl GF_AssertFail _0202DE3E: mov r0, #1 mov r1, #7 @@ -554,7 +554,7 @@ sub_0202DE5C: ; 0x0202DE5C lsl r0, r0, #0xa cmp r4, r0 blt _0202DE6E - bl sub_02022974 + bl GF_AssertFail _0202DE6E: asr r0, r4, #2 lsr r0, r0, #0x1d @@ -588,7 +588,7 @@ sub_0202DE8C: ; 0x0202DE8C lsl r0, r1, #0xb cmp r4, r0 blt _0202DEAC - bl sub_02022974 + bl GF_AssertFail _0202DEAC: asr r0, r4, #2 lsr r0, r0, #0x1d diff --git a/asm/unk_0202DF8C.s b/asm/unk_0202DF8C.s index 1e937a5414..e985c0653f 100644 --- a/asm/unk_0202DF8C.s +++ b/asm/unk_0202DF8C.s @@ -35,14 +35,14 @@ sub_0202DFA8: ; 0x0202DFA8 str r2, [sp, #8] cmp r0, #0 bne _0202DFBA - bl sub_02022974 + bl GF_AssertFail _0202DFBA: ldr r1, _0202E138 ; =0x00002AA8 ldr r0, [sp] ldr r0, [r0, r1] cmp r0, #0x1e blo _0202DFC8 - bl sub_02022974 + bl GF_AssertFail _0202DFC8: ldr r1, _0202E13C ; =0x00002AAC ldr r0, [sp] @@ -227,13 +227,13 @@ sub_0202E148: ; 0x0202E148 push {r4, lr} add r4, r0, #0 bne _0202E152 - bl sub_02022974 + bl GF_AssertFail _0202E152: ldr r0, _0202E16C ; =0x00002AA8 ldr r0, [r4, r0] cmp r0, #0x1e blo _0202E15E - bl sub_02022974 + bl GF_AssertFail _0202E15E: ldr r0, _0202E170 ; =0x00002AAC ldr r0, [r4, r0] @@ -254,17 +254,17 @@ sub_0202E174: ; 0x0202E174 add r4, r1, #0 cmp r5, #0 bne _0202E182 - bl sub_02022974 + bl GF_AssertFail _0202E182: ldr r0, _0202E1A0 ; =0x00002AA8 ldr r0, [r5, r0] cmp r0, #0x1e blo _0202E18E - bl sub_02022974 + bl GF_AssertFail _0202E18E: cmp r4, #0x1e blt _0202E196 - bl sub_02022974 + bl GF_AssertFail _0202E196: ldr r0, _0202E1A4 ; =0x00002AAC ldr r0, [r5, r0] @@ -282,17 +282,17 @@ sub_0202E1A8: ; 0x0202E1A8 add r4, r1, #0 cmp r5, #0 bne _0202E1B6 - bl sub_02022974 + bl GF_AssertFail _0202E1B6: ldr r0, _0202E1F0 ; =0x00002AA8 ldr r0, [r5, r0] cmp r0, #0x1e blo _0202E1C2 - bl sub_02022974 + bl GF_AssertFail _0202E1C2: cmp r4, #0x1e blt _0202E1CA - bl sub_02022974 + bl GF_AssertFail _0202E1CA: ldr r0, _0202E1F0 ; =0x00002AA8 ldr r0, [r5, r0] @@ -329,17 +329,17 @@ sub_0202E1F4: ; 0x0202E1F4 add r4, r3, #0 cmp r5, #0 bne _0202E206 - bl sub_02022974 + bl GF_AssertFail _0202E206: ldr r0, _0202E270 ; =0x00002AA8 ldr r0, [r5, r0] cmp r0, #0x1e blo _0202E212 - bl sub_02022974 + bl GF_AssertFail _0202E212: cmp r6, #0x1e blt _0202E21A - bl sub_02022974 + bl GF_AssertFail _0202E21A: ldr r0, _0202E270 ; =0x00002AA8 ldr r0, [r5, r0] @@ -395,17 +395,17 @@ sub_0202E274: ; 0x0202E274 add r4, r2, #0 cmp r5, #0 bne _0202E284 - bl sub_02022974 + bl GF_AssertFail _0202E284: ldr r0, _0202E2C8 ; =0x00002AA8 ldr r0, [r5, r0] cmp r0, #0x1e blo _0202E290 - bl sub_02022974 + bl GF_AssertFail _0202E290: cmp r6, #0x1e blt _0202E298 - bl sub_02022974 + bl GF_AssertFail _0202E298: ldr r0, _0202E2C8 ; =0x00002AA8 ldr r0, [r5, r0] diff --git a/asm/unk_0202E2CC.s b/asm/unk_0202E2CC.s index b573162c44..8610a8a3f8 100644 --- a/asm/unk_0202E2CC.s +++ b/asm/unk_0202E2CC.s @@ -134,7 +134,7 @@ _0202E398: add r3, r3, #1 cmp r3, #4 blt _0202E388 - bl sub_02022974 + bl GF_AssertFail mov r0, #0x1b bl sub_02025C84 pop {r3, pc} @@ -369,7 +369,7 @@ _0202E50A: add r4, #0xcc b _0202E514 _0202E510: - bl sub_02022974 + bl GF_AssertFail _0202E514: add r0, r4, #0 pop {r4, pc} @@ -408,7 +408,7 @@ _0202E546: add r4, r0, r1 b _0202E550 _0202E54C: - bl sub_02022974 + bl GF_AssertFail _0202E550: add r0, r4, #0 pop {r4, pc} @@ -734,7 +734,7 @@ sub_0202E768: ; 0x0202E768 bl sub_0202E7C0 cmp r0, #1 beq _0202E77E - bl sub_02022974 + bl GF_AssertFail _0202E77E: add r0, r5, #0 add r1, r6, #0 @@ -758,7 +758,7 @@ sub_0202E794: ; 0x0202E794 bl sub_0202E7C0 cmp r0, #0 beq _0202E7AA - bl sub_02022974 + bl GF_AssertFail _0202E7AA: add r0, r5, #0 add r1, r6, #0 diff --git a/asm/unk_0202E840.s b/asm/unk_0202E840.s index d09981c970..62dd772e23 100644 --- a/asm/unk_0202E840.s +++ b/asm/unk_0202E840.s @@ -109,7 +109,7 @@ sub_0202E8D4: ; 0x0202E8D4 cmp r2, #6 blo _0202E8E2 blo _0202E91A - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} _0202E8E2: mov r3, #0x90 diff --git a/asm/unk_0202EEC0.s b/asm/unk_0202EEC0.s index d616eb03a2..7e09fccefb 100644 --- a/asm/unk_0202EEC0.s +++ b/asm/unk_0202EEC0.s @@ -34,7 +34,7 @@ _0202EEDC: bl sub_02074470 cmp r0, #0 beq _0202EEF4 - bl sub_02022974 + bl GF_AssertFail _0202EEF4: add r4, r4, #1 add r5, #0xec @@ -65,7 +65,7 @@ _0202EF18: bl sub_02074470 cmp r0, #0 beq _0202EF30 - bl sub_02022974 + bl GF_AssertFail _0202EF30: add r4, r4, #1 add r5, #0xec @@ -187,7 +187,7 @@ sub_0202F000: ; 0x0202F000 add r4, r2, #0 cmp r5, #6 blt _0202F010 - bl sub_02022974 + bl GF_AssertFail _0202F010: mov r0, #0xec mul r0, r5 diff --git a/asm/unk_0202F1D4.s b/asm/unk_0202F1D4.s index 1f9912c3c1..137b637a7a 100644 --- a/asm/unk_0202F1D4.s +++ b/asm/unk_0202F1D4.s @@ -65,7 +65,7 @@ sub_0202F22C: ; 0x0202F22C ldr r0, [r0, #0] cmp r0, #0 bne _0202F23A - bl sub_02022974 + bl GF_AssertFail _0202F23A: ldr r0, _0202F24C ; =0x021C07A4 ldr r0, [r0, #0] @@ -100,7 +100,7 @@ sub_0202F264: ; 0x0202F264 ldr r0, [r0, #0] cmp r0, #0 bne _0202F272 - bl sub_02022974 + bl GF_AssertFail _0202F272: ldr r0, _0202F278 ; =0x021C07A4 ldr r0, [r0, #0] @@ -116,7 +116,7 @@ sub_0202F27C: ; 0x0202F27C ldr r0, [r0, #0] cmp r0, #0 bne _0202F28A - bl sub_02022974 + bl GF_AssertFail _0202F28A: ldr r0, _0202F294 ; =0x021C07A4 ldr r0, [r0, #0] @@ -944,7 +944,7 @@ sub_0202F884: ; 0x0202F884 ldr r0, [r0, #0] cmp r0, #0 bne _0202F896 - bl sub_02022974 + bl GF_AssertFail _0202F896: ldr r0, _0202F8A8 ; =0x021C07A4 ldr r1, [r0, #0] @@ -1600,7 +1600,7 @@ sub_0202FD88: ; 0x0202FD88 ldr r0, [r0, #0] cmp r0, #0 bne _0202FD98 - bl sub_02022974 + bl GF_AssertFail _0202FD98: add r0, r4, #0 mov r1, #0x64 @@ -1626,7 +1626,7 @@ sub_0202FDB8: ; 0x0202FDB8 ldr r0, [r0, #0] cmp r0, #0 bne _0202FDC8 - bl sub_02022974 + bl GF_AssertFail _0202FDC8: add r0, r4, #0 mov r1, #0x80 @@ -1651,7 +1651,7 @@ sub_0202FDE8: ; 0x0202FDE8 ldr r0, [r0, #0] cmp r0, #0 bne _0202FDF6 - bl sub_02022974 + bl GF_AssertFail _0202FDF6: ldr r0, _0202FE00 ; =0x021C07A4 ldr r0, [r0, #0] @@ -1668,7 +1668,7 @@ sub_0202FE04: ; 0x0202FE04 ldr r0, [r0, #0] cmp r0, #0 bne _0202FE12 - bl sub_02022974 + bl GF_AssertFail _0202FE12: ldr r0, _0202FE1C ; =0x021C07A4 ldr r0, [r0, #0] @@ -1689,7 +1689,7 @@ sub_0202FE20: ; 0x0202FE20 add r4, r3, #0 cmp r0, #0 bne _0202FE36 - bl sub_02022974 + bl GF_AssertFail _0202FE36: ldr r1, _0202FE88 ; =0x021C07A4 add r0, r6, #0 @@ -1757,7 +1757,7 @@ _0202FEAE: ; jump table _0202FEBA: cmp r5, #0xc blt _0202FEC2 - bl sub_02022974 + bl GF_AssertFail _0202FEC2: lsl r0, r5, #1 ldrh r0, [r4, r0] @@ -1773,7 +1773,7 @@ _0202FED2: _0202FED6: cmp r5, #0xc blt _0202FEDE - bl sub_02022974 + bl GF_AssertFail _0202FEDE: add r0, r4, r5 ldrb r0, [r0, #0x18] @@ -1811,7 +1811,7 @@ _0202FF10: mov r1, #0 pop {r3, r4, r5, pc} _0202FF18: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 add r1, r0, #0 pop {r3, r4, r5, pc} diff --git a/asm/unk_02030108.s b/asm/unk_02030108.s index 16ec611efd..855b9fa14a 100644 --- a/asm/unk_02030108.s +++ b/asm/unk_02030108.s @@ -99,7 +99,7 @@ _02030188: strh r3, [r0, #0x2c] pop {r4, pc} _02030192: - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} thumb_func_end sub_02030140 @@ -143,7 +143,7 @@ _020301CE: ldrh r0, [r0, #0x2c] pop {r3, pc} _020301D6: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -275,7 +275,7 @@ _0203029A: strb r1, [r0] pop {r4, pc} _020302AC: - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} ; .align 2, 0 thumb_func_end sub_02030280 @@ -292,7 +292,7 @@ sub_020302B4: ; 0x020302B4 and r0, r1 pop {r3, pc} _020302C6: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 diff --git a/asm/unk_020302D0.s b/asm/unk_020302D0.s index 0475d49e7a..bda3c82b97 100644 --- a/asm/unk_020302D0.s +++ b/asm/unk_020302D0.s @@ -131,7 +131,7 @@ _02030386: strh r3, [r0] pop {r4, pc} _02030392: - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} thumb_func_end sub_02030308 @@ -203,7 +203,7 @@ _020303FC: ldrh r0, [r0] pop {r3, pc} _02030406: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -265,7 +265,7 @@ _02030462: strb r1, [r0, #1] pop {r4, pc} _02030468: - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} ; .align 2, 0 thumb_func_end sub_02030430 @@ -289,7 +289,7 @@ _02030488: ldrb r0, [r0, #1] pop {r3, pc} _0203048C: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} thumb_func_end sub_02030470 \ No newline at end of file diff --git a/asm/unk_02030494.s b/asm/unk_02030494.s index c6a57357f5..f62f68ba42 100644 --- a/asm/unk_02030494.s +++ b/asm/unk_02030494.s @@ -122,7 +122,7 @@ _0203053C: strh r3, [r0, #0x2a] pop {r4, pc} _02030546: - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} thumb_func_end sub_020304CC @@ -182,7 +182,7 @@ _0203059C: ldrh r0, [r0, #0x2a] pop {r3, pc} _020305A4: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} thumb_func_end sub_0203054C @@ -235,7 +235,7 @@ _020305E6: strb r1, [r0] pop {r4, pc} _020305F8: - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} ; .align 2, 0 thumb_func_end sub_020305CC @@ -252,7 +252,7 @@ sub_02030600: ; 0x02030600 and r0, r1 pop {r3, pc} _02030612: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 diff --git a/asm/unk_0203061C.s b/asm/unk_0203061C.s index 11a6b9487e..a828438f16 100644 --- a/asm/unk_0203061C.s +++ b/asm/unk_0203061C.s @@ -93,7 +93,7 @@ _020306C2: mvn r3, r3 cmp r2, r3 bne _020306D2 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} _020306D2: @@ -126,7 +126,7 @@ _020306F6: blt _02030734 cmp r4, #0xff bne _02030706 - bl sub_02022974 + bl GF_AssertFail _02030706: cmp r4, #0x10 blt _0203070E @@ -156,7 +156,7 @@ _02030726: _02030734: cmp r4, #0xff beq _0203073C - bl sub_02022974 + bl GF_AssertFail _0203073C: lsl r0, r5, #1 strh r7, [r6, r0] @@ -164,7 +164,7 @@ _0203073C: _02030742: cmp r4, #0xff bne _0203074A - bl sub_02022974 + bl GF_AssertFail _0203074A: lsl r0, r4, #6 sub r5, #0x70 @@ -210,7 +210,7 @@ sub_02030788: ; 0x02030788 add r6, r0, #0 cmp r5, #0xff bne _02030796 - bl sub_02022974 + bl GF_AssertFail _02030796: cmp r5, #0x1f bge _020307DC diff --git a/asm/unk_02030880.s b/asm/unk_02030880.s index 4abbbf49ef..290ddc8f56 100644 --- a/asm/unk_02030880.s +++ b/asm/unk_02030880.s @@ -87,7 +87,7 @@ _020308F0: ldrh r0, [r1, r0] pop {r4, r5, r6, pc} _020308FC: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} ; .align 2, 0 @@ -128,7 +128,7 @@ _02030932: strh r3, [r1, r0] b _02030946 _0203093E: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, pc} _02030946: @@ -197,7 +197,7 @@ sub_020309A0: ; 0x020309A0 cmp r6, #0x3c ble _020309C0 _020309BC: - bl sub_02022974 + bl GF_AssertFail _020309C0: ldr r1, [sp, #4] mov r0, #0 @@ -214,7 +214,7 @@ _020309C0: _020309D8: cmp r0, #0 bne _020309E0 - bl sub_02022974 + bl GF_AssertFail _020309E0: mov r0, #1 str r0, [r4, #0] diff --git a/asm/unk_02032188.s b/asm/unk_02032188.s index eb130e4b87..41b499d67e 100644 --- a/asm/unk_02032188.s +++ b/asm/unk_02032188.s @@ -42,7 +42,7 @@ _020321B0: _020321C0: cmp r7, #0 bne _020321C8 - bl sub_02022974 + bl GF_AssertFail _020321C8: add r0, r5, #0 add r1, r4, #0 diff --git a/asm/unk_020322D8.s b/asm/unk_020322D8.s index 6607606e7c..d0f9e58412 100644 --- a/asm/unk_020322D8.s +++ b/asm/unk_020322D8.s @@ -285,7 +285,7 @@ _020324B2: ldr r0, _02032524 ; =0x0000FFFE cmp r7, r0 blt _020324BC - bl sub_02022974 + bl GF_AssertFail _020324BC: ldr r0, [sp] bl sub_02032868 diff --git a/asm/unk_0203266C.s b/asm/unk_0203266C.s index 8105eb7f31..a016601bfc 100644 --- a/asm/unk_0203266C.s +++ b/asm/unk_0203266C.s @@ -23,7 +23,7 @@ _02032678: bne _02032678 cmp r4, #0x25 blo _0203268C - bl sub_02022974 + bl GF_AssertFail _0203268C: add r0, sp, #0 ldrb r0, [r0, r4] @@ -50,7 +50,7 @@ _020326A4: bne _020326A4 cmp r4, #0x25 blo _020326B8 - bl sub_02022974 + bl GF_AssertFail _020326B8: add r0, sp, #0 ldrb r0, [r0, r4] diff --git a/asm/unk_02032798.s b/asm/unk_02032798.s index a19e47ca86..d5b2ed5f14 100644 --- a/asm/unk_02032798.s +++ b/asm/unk_02032798.s @@ -82,7 +82,7 @@ _02032814: ldr r0, [r0, #0] cmp r0, #0 bne _02032820 - bl sub_02022974 + bl GF_AssertFail _02032820: ldr r0, _02032864 ; =0x021C07B0 ldr r1, [r0, #0] @@ -142,7 +142,7 @@ _0203287E: ldr r0, [r0, #0] cmp r0, #0 bne _0203288A - bl sub_02022974 + bl GF_AssertFail _0203288A: ldr r0, _020328CC ; =0x021C07B0 ldr r1, [r0, #0] @@ -156,7 +156,7 @@ _0203289A: add r0, #0x16 cmp r5, r0 ble _020328AE - bl sub_02022974 + bl GF_AssertFail bl sub_020363BC mov r0, #0 pop {r3, r4, r5, pc} diff --git a/asm/unk_020329E0.s b/asm/unk_020329E0.s index dcb4ce0b36..e4a66cb3dd 100644 --- a/asm/unk_020329E0.s +++ b/asm/unk_020329E0.s @@ -1052,7 +1052,7 @@ _02033146: ldr r0, [sp, #8] cmp r0, #0 bge _02033150 - bl sub_02022974 + bl GF_AssertFail _02033150: ldr r0, _020331AC ; =0x021C07B4 mov r2, #0xdb diff --git a/asm/unk_02033200.s b/asm/unk_02033200.s index 0be6fbb893..285cd0f11d 100644 --- a/asm/unk_02033200.s +++ b/asm/unk_02033200.s @@ -857,7 +857,7 @@ _02033858: add r5, r5, #2 cmp r3, #0x10 blt _02033848 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} ; .align 2, 0 @@ -1190,12 +1190,12 @@ sub_02033AA8: ; 0x02033AA8 bl sub_0202602C cmp r0, #0x20 ble _02033ACE - bl sub_02022974 + bl GF_AssertFail _02033ACE: bl sub_02025E68 cmp r0, #0x20 beq _02033ADA - bl sub_02022974 + bl GF_AssertFail _02033ADA: bl sub_02025E68 add r1, r5, #0 @@ -1763,7 +1763,7 @@ sub_02033F0C: ; 0x02033F0C add r4, r0, #0 cmp r5, #0x25 blo _02033F1E - bl sub_02022974 + bl GF_AssertFail _02033F1E: cmp r5, #0xa bne _02033F28 @@ -1888,7 +1888,7 @@ sub_02033FDC: ; 0x02033FDC beq _02034008 cmp r4, #8 blt _02033FF2 - bl sub_02022974 + bl GF_AssertFail _02033FF2: ldr r1, _0203400C ; =0x021C07B8 add r0, r5, #0 diff --git a/asm/unk_02034198.s b/asm/unk_02034198.s index c898071786..a030f7913d 100644 --- a/asm/unk_02034198.s +++ b/asm/unk_02034198.s @@ -174,7 +174,7 @@ _020342F0: mov r4, #1 cmp r0, #0 bne _020342FC - bl sub_02022974 + bl GF_AssertFail _020342FC: ldr r2, _02034350 ; =0x021C07C4 ldr r1, _02034364 ; =0x00000694 @@ -2280,7 +2280,7 @@ sub_02035394: ; 0x02035394 strb r1, [r0, #1] pop {r3, pc} _020353A4: - bl sub_02022974 + bl GF_AssertFail pop {r3, pc} nop _020353AC: .word 0x02100A1C @@ -2297,7 +2297,7 @@ sub_020353B0: ; 0x020353B0 strb r1, [r0] pop {r3, pc} _020353C0: - bl sub_02022974 + bl GF_AssertFail pop {r3, pc} nop _020353C8: .word 0x02100A1C @@ -3173,7 +3173,7 @@ sub_02035A3C: ; 0x02035A3C bl sub_0203608C cmp r0, #0 beq _02035A58 - bl sub_02022974 + bl GF_AssertFail add sp, #8 mov r0, #0 pop {r4, r5, r6, pc} diff --git a/asm/unk_020366A0.s b/asm/unk_020366A0.s index eb3e5e8bdb..db4b20c959 100644 --- a/asm/unk_020366A0.s +++ b/asm/unk_020366A0.s @@ -17,7 +17,7 @@ sub_020366A0: ; 0x020366A0 bne _0203672C cmp r5, #0 bne _020366B6 - bl sub_02022974 + bl GF_AssertFail _020366B6: bl sub_02033478 mov r0, #0xf @@ -3797,7 +3797,7 @@ sub_020382F8: ; 0x020382F8 ldr r0, [r0, #0] cmp r0, #0 bne _02038306 - bl sub_02022974 + bl GF_AssertFail _02038306: ldr r0, _02038310 ; =0x021C07D4 ldr r0, [r0, #0] @@ -4483,12 +4483,12 @@ sub_0203883C: ; 0x0203883C ldr r0, [r0, #0] cmp r0, #0 bne _0203884C - bl sub_02022974 + bl GF_AssertFail _0203884C: bl sub_020382C0 cmp r0, #1 beq _02038858 - bl sub_02022974 + bl GF_AssertFail _02038858: add r0, r4, #0 bl ov66_02233184 diff --git a/asm/unk_02038ED4.s b/asm/unk_02038ED4.s index e3695a556e..8b001ddd61 100644 --- a/asm/unk_02038ED4.s +++ b/asm/unk_02038ED4.s @@ -59,11 +59,11 @@ _02038F28: add r5, r0, #0 cmp r5, #2 bne _02038F36 - bl sub_02022974 + bl GF_AssertFail _02038F36: cmp r5, #3 bne _02038F3E - bl sub_02022974 + bl GF_AssertFail _02038F3E: cmp r5, #1 bne _02038F88 @@ -85,11 +85,11 @@ _02038F5E: add r5, r0, #0 cmp r5, #3 bne _02038F6C - bl sub_02022974 + bl GF_AssertFail _02038F6C: cmp r5, #1 bne _02038F74 - bl sub_02022974 + bl GF_AssertFail _02038F74: cmp r5, #2 bne _02038F88 diff --git a/asm/unk_0203909C.s b/asm/unk_0203909C.s index 984ae5174b..4ae6e0fddb 100644 --- a/asm/unk_0203909C.s +++ b/asm/unk_0203909C.s @@ -196,7 +196,7 @@ _02039200: str r0, [r6, #0] cmp r0, #3 bne _02039226 - bl sub_02022974 + bl GF_AssertFail _02039226: ldr r0, [r6, #0] cmp r0, #0 diff --git a/asm/unk_02039C80.s b/asm/unk_02039C80.s index 2759df1fb5..da96f98529 100644 --- a/asm/unk_02039C80.s +++ b/asm/unk_02039C80.s @@ -56,7 +56,7 @@ _02039CB0: ldrb r7, [r6, #4] cmp r7, #0x10 bls _02039CE2 - bl sub_02022974 + bl GF_AssertFail _02039CE2: ldr r1, _02039D68 ; =0x00001196 add r0, r5, #0 @@ -153,15 +153,15 @@ sub_02039D90: ; 0x02039D90 add r5, r0, #0 add r4, r1, #0 bne _02039D9C - bl sub_02022974 + bl GF_AssertFail _02039D9C: cmp r5, #0 bne _02039DA4 - bl sub_02022974 + bl GF_AssertFail _02039DA4: cmp r5, r4 bne _02039DAC - bl sub_02022974 + bl GF_AssertFail _02039DAC: ldr r1, _02039DBC ; =0x000008D5 _02039DAE: @@ -214,7 +214,7 @@ sub_02039DEC: ; 0x02039DEC mul r0, r1 cmp r5, r0 blt _02039E00 - bl sub_02022974 + bl GF_AssertFail _02039E00: lsl r0, r5, #1 add r1, r4, r0 @@ -230,7 +230,7 @@ sub_02039E10: ; 0x02039E10 push {r4, lr} add r4, r0, #0 bne _02039E1A - bl sub_02022974 + bl GF_AssertFail _02039E1A: ldrb r0, [r4] pop {r4, pc} @@ -242,7 +242,7 @@ sub_02039E20: ; 0x02039E20 push {r4, lr} add r4, r0, #0 bne _02039E2A - bl sub_02022974 + bl GF_AssertFail _02039E2A: ldrb r0, [r4, #1] pop {r4, pc} @@ -263,7 +263,7 @@ sub_02039E30: ; 0x02039E30 cmp r5, r6 blt _02039E4A _02039E46: - bl sub_02022974 + bl GF_AssertFail _02039E4A: cmp r4, #0 blt _02039E54 @@ -271,7 +271,7 @@ _02039E4A: cmp r4, r0 blt _02039E58 _02039E54: - bl sub_02022974 + bl GF_AssertFail _02039E58: add r0, r4, #0 mul r0, r6 @@ -296,7 +296,7 @@ sub_02039E68: ; 0x02039E68 cmp r4, r0 blt _02039E80 _02039E7C: - bl sub_02022974 + bl GF_AssertFail _02039E80: lsl r0, r4, #1 add r0, r5, r0 @@ -319,7 +319,7 @@ sub_02039E8C: ; 0x02039E8C add r6, r3, #0 cmp r4, r0 blt _02039E9E - bl sub_02022974 + bl GF_AssertFail _02039E9E: ldr r0, [sp, #0x10] mul r0, r6 @@ -328,7 +328,7 @@ _02039E9E: lsl r0, r0, #2 cmp r4, r0 blt _02039EB0 - bl sub_02022974 + bl GF_AssertFail _02039EB0: ldr r0, _02039EB8 ; =0x0000070E add r1, r5, r4 @@ -369,7 +369,7 @@ sub_02039EF0: ; 0x02039EF0 push {r4, lr} add r4, r0, #0 bne _02039EFA - bl sub_02022974 + bl GF_AssertFail _02039EFA: add r0, r4, #0 bl sub_020181C4 @@ -411,13 +411,13 @@ sub_02039F10: ; 0x02039F10 ldrb r0, [r0, #1] cmp r5, r0 blt _02039F42 - bl sub_02022974 + bl GF_AssertFail _02039F42: add r0, sp, #0 ldrb r0, [r0] cmp r4, r0 blt _02039F4E - bl sub_02022974 + bl GF_AssertFail _02039F4E: add r0, sp, #0 ldrb r0, [r0, #1] @@ -446,7 +446,7 @@ sub_02039F74: ; 0x02039F74 add r5, r0, #0 add r4, r1, #0 bne _02039F80 - bl sub_02022974 + bl GF_AssertFail _02039F80: add r0, r5, #0 add r1, r4, #0 diff --git a/asm/unk_0203A024.s b/asm/unk_0203A024.s index 0e770bab9a..e26b0ade62 100644 --- a/asm/unk_0203A024.s +++ b/asm/unk_0203A024.s @@ -12,7 +12,7 @@ sub_0203A024: ; 0x0203A024 ldr r1, _0203A034 ; =0x00000251 cmp r0, r1 blo _0203A032 - bl sub_02022974 + bl GF_AssertFail mov r0, #3 _0203A032: pop {r3, pc} diff --git a/asm/unk_0203A378.s b/asm/unk_0203A378.s index 3c7815c3c5..4a85dfa3b5 100644 --- a/asm/unk_0203A378.s +++ b/asm/unk_0203A378.s @@ -14,7 +14,7 @@ sub_0203A378: ; 0x0203A378 add r4, r1, #0 cmp r0, #0 beq _0203A388 - bl sub_02022974 + bl GF_AssertFail _0203A388: ldr r1, _0203A394 ; =0x00000AC8 add r0, r4, #0 @@ -32,7 +32,7 @@ sub_0203A398: ; 0x0203A398 ldr r0, [r4, #0x14] cmp r0, #0 bne _0203A3A6 - bl sub_02022974 + bl GF_AssertFail _0203A3A6: ldr r0, [r4, #0x14] bl sub_020181C4 @@ -48,7 +48,7 @@ sub_0203A3B0: ; 0x0203A3B0 add r4, r1, #0 cmp r0, #0 bne _0203A3C0 - bl sub_02022974 + bl GF_AssertFail _0203A3C0: ldr r0, [r5, #0x14] add r1, r4, #0 @@ -82,7 +82,7 @@ sub_0203A3E8: ; 0x0203A3E8 lsl r1, r1, #0xa cmp r0, r1 blo _0203A408 - bl sub_02022974 + bl GF_AssertFail _0203A408: add r5, #0x20 add r0, r5, #0 @@ -101,7 +101,7 @@ sub_0203A418: ; 0x0203A418 ldr r4, [r0, #4] cmp r0, #0 bne _0203A428 - bl sub_02022974 + bl GF_AssertFail _0203A428: cmp r4, #0 beq _0203A43C @@ -248,7 +248,7 @@ _0203A4EC: cmp r2, r5 blo _0203A4DA _0203A4F4: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} thumb_func_end sub_0203A4C4 @@ -278,7 +278,7 @@ _0203A51C: cmp r3, r5 blo _0203A50C _0203A524: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} thumb_func_end sub_0203A4FC @@ -308,7 +308,7 @@ _0203A54C: cmp r3, r5 blo _0203A53C _0203A554: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} thumb_func_end sub_0203A52C @@ -485,7 +485,7 @@ sub_0203A64C: ; 0x0203A64C lsl r1, r1, #8 cmp r0, r1 blo _0203A67C - bl sub_02022974 + bl GF_AssertFail _0203A67C: mov r0, #0x82 lsl r0, r0, #4 @@ -503,7 +503,7 @@ sub_0203A68C: ; 0x0203A68C ldr r0, [r4, #0x14] cmp r0, #0 bne _0203A69A - bl sub_02022974 + bl GF_AssertFail _0203A69A: mov r0, #0x82 ldr r1, [r4, #0x14] diff --git a/asm/unk_0203A7D8.s b/asm/unk_0203A7D8.s index 2db5ab754c..dbdd86cb96 100644 --- a/asm/unk_0203A7D8.s +++ b/asm/unk_0203A7D8.s @@ -14,7 +14,7 @@ sub_0203A7D8: ; 0x0203A7D8 cmp r0, #0x14 bls _0203A7E8 _0203A7E2: - bl sub_02022974 + bl GF_AssertFail mov r0, #1 _0203A7E8: sub r0, r0, #1 diff --git a/asm/unk_0203A944.s b/asm/unk_0203A944.s index 6a50a8b25e..20aa4ac9ed 100644 --- a/asm/unk_0203A944.s +++ b/asm/unk_0203A944.s @@ -26,7 +26,7 @@ sub_0203A944: ; 0x0203A944 cmp r5, r0 blt _0203A970 _0203A96C: - bl sub_02022974 + bl GF_AssertFail _0203A970: ldr r0, [r6, #8] cmp r0, #2 diff --git a/asm/unk_0203CC84.s b/asm/unk_0203CC84.s index 3487eba768..f5a1603cd1 100644 --- a/asm/unk_0203CC84.s +++ b/asm/unk_0203CC84.s @@ -82,13 +82,13 @@ sub_0203CD00: ; 0x0203CD00 ldr r0, [r0, #4] cmp r0, #0 beq _0203CD10 - bl sub_02022974 + bl GF_AssertFail _0203CD10: ldr r0, [r4, #0] ldr r0, [r0, #0] cmp r0, #0 beq _0203CD1C - bl sub_02022974 + bl GF_AssertFail _0203CD1C: ldr r0, _0203CD3C ; =0x00000005 mov r1, #2 @@ -170,7 +170,7 @@ sub_0203CD84: ; 0x0203CD84 add r6, r2, #0 cmp r0, #0 beq _0203CD98 - bl sub_02022974 + bl GF_AssertFail _0203CD98: add r0, r5, #0 bl sub_0203CD44 diff --git a/asm/unk_0203D1B8.s b/asm/unk_0203D1B8.s index b8b18e6da8..822a105ee2 100644 --- a/asm/unk_0203D1B8.s +++ b/asm/unk_0203D1B8.s @@ -130,7 +130,7 @@ _0203D284: str r1, [r0, #0] b _0203D290 _0203D28C: - bl sub_02022974 + bl GF_AssertFail _0203D290: ldr r1, _0203D2BC ; =0x02100A80 add r0, r6, #0 @@ -166,7 +166,7 @@ sub_0203D2C4: ; 0x0203D2C4 bl sub_0207CB9C cmp r0, #5 bne _0203D2DE - bl sub_02022974 + bl GF_AssertFail _0203D2DE: add r0, r4, #0 pop {r3, r4, r5, pc} @@ -2272,7 +2272,7 @@ sub_0203E2FC: ; 0x0203E2FC bl ov5_021E7278 add r5, r0, #0 bne _0203E314 - bl sub_02022974 + bl GF_AssertFail _0203E314: add r0, r4, #0 add r1, r5, #0 diff --git a/asm/unk_0203E724.s b/asm/unk_0203E724.s index c1d1e15d54..534e6f1ac8 100644 --- a/asm/unk_0203E724.s +++ b/asm/unk_0203E724.s @@ -118,7 +118,7 @@ _0203E7BA: ldr r0, [r4, #0x60] cmp r1, r0 blo _0203E7D2 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 strb r0, [r4, #1] pop {r4, pc} diff --git a/asm/unk_0203E880.s b/asm/unk_0203E880.s index 70de1358c2..3c9f945630 100644 --- a/asm/unk_0203E880.s +++ b/asm/unk_0203E880.s @@ -172,7 +172,7 @@ _0203E9B0: ldrb r0, [r4, #9] cmp r0, #0 bne _0203E9D0 - bl sub_02022974 + bl GF_AssertFail _0203E9D0: mov r0, #0 str r0, [r5, #0x38] @@ -227,7 +227,7 @@ sub_0203EA28: ; 0x0203EA28 bl sub_02018144 add r4, r0, #0 bne _0203EA3A - bl sub_02022974 + bl GF_AssertFail _0203EA3A: add r0, r4, #0 mov r1, #0 @@ -305,7 +305,7 @@ sub_0203EAB8: ; 0x0203EAB8 bl sub_02018144 add r4, r0, #0 bne _0203EACE - bl sub_02022974 + bl GF_AssertFail _0203EACE: ldr r2, _0203EAEC ; =0x020EAB80 ldr r1, _0203EAF0 ; =0x020EAC58 @@ -1051,7 +1051,7 @@ _0203F086: add r0, r0, r1 pop {r3, pc} _0203F090: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} thumb_func_end sub_0203EF60 @@ -1067,7 +1067,7 @@ sub_0203F098: ; 0x0203F098 ldr r0, _0203F0BC ; =0x0003643F cmp r1, r0 beq _0203F0B0 - bl sub_02022974 + bl GF_AssertFail _0203F0B0: add r0, r4, #0 add r1, r5, #0 @@ -1183,7 +1183,7 @@ sub_0203F164: ; 0x0203F164 add r5, r0, #0 cmp r4, #0x10 blo _0203F172 - bl sub_02022974 + bl GF_AssertFail _0203F172: ldr r1, _0203F184 ; =0x00004020 add r0, r5, #0 @@ -1530,7 +1530,7 @@ _0203F3E4: ldr r0, _0203F400 ; =0x00000101 cmp r3, r0 blo _0203F3F2 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _0203F3F2: @@ -1577,7 +1577,7 @@ _0203F442: ldr r0, _0203F474 ; =0x00000101 cmp r2, r0 blo _0203F450 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _0203F450: diff --git a/asm/unk_0203F6C4.s b/asm/unk_0203F6C4.s index e544b81f22..e4235ed11c 100644 --- a/asm/unk_0203F6C4.s +++ b/asm/unk_0203F6C4.s @@ -3040,7 +3040,7 @@ sub_02040D74: ; 0x02040D74 bl sub_02040ED4 cmp r0, #0 bne _02040DAA - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} _02040DAA: @@ -3102,7 +3102,7 @@ sub_02040DD8: ; 0x02040DD8 str r0, [sp, #4] cmp r0, #0 bne _02040E2E - bl sub_02022974 + bl GF_AssertFail _02040E2E: mov r0, #4 add r1, r0, #0 @@ -3250,7 +3250,7 @@ sub_02040F28: ; 0x02040F28 bl sub_02018144 add r4, r0, #0 bne _02040F42 - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _02040F42: str r5, [r4, #0xc] @@ -3292,7 +3292,7 @@ _02040F8A: ldrb r0, [r4] cmp r0, #0 bne _02040F9C - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} _02040F9C: sub r0, r0, #1 @@ -3629,7 +3629,7 @@ sub_0204120C: ; 0x0204120C bl sub_02061A74 cmp r0, #0 bne _0204124E - bl sub_02022974 + bl GF_AssertFail _0204124E: mov r0, #0 add sp, #4 @@ -3653,7 +3653,7 @@ sub_02041254: ; 0x02041254 bl sub_0206251C cmp r0, #0 bne _0204127E - bl sub_02022974 + bl GF_AssertFail b _02041282 _0204127E: bl sub_02061B28 @@ -4355,7 +4355,7 @@ sub_02041814: ; 0x02041814 ldr r0, [r4, #0] cmp r0, #0 bne _02041840 - bl sub_02022974 + bl GF_AssertFail _02041840: ldr r0, [r4, #0] bl sub_0203D408 @@ -4401,7 +4401,7 @@ sub_02041860: ; 0x02041860 ldr r7, [r4, #0] cmp r7, #0 bne _020418A0 - bl sub_02022974 + bl GF_AssertFail _020418A0: ldr r0, [r4, #0] bl sub_0203D408 @@ -4472,7 +4472,7 @@ sub_020418E0: ; 0x020418E0 ldr r4, [r6, #0] cmp r4, #0 bne _02041934 - bl sub_02022974 + bl GF_AssertFail _02041934: ldr r0, [r6, #0] bl sub_0203D408 @@ -4551,7 +4551,7 @@ sub_02041984: ; 0x02041984 ldr r4, [r6, #0] cmp r4, #0 bne _020419D8 - bl sub_02022974 + bl GF_AssertFail _020419D8: ldr r0, [r6, #0] bl sub_0203D408 @@ -4683,7 +4683,7 @@ sub_02041AB0: ; 0x02041AB0 ldr r0, [r4, #0] cmp r0, #0 bne _02041AF0 - bl sub_02022974 + bl GF_AssertFail _02041AF0: ldr r0, [r4, #0] bl sub_0203D408 @@ -4764,7 +4764,7 @@ sub_02041B68: ; 0x02041B68 ldr r0, [r4, #0] cmp r0, #0 bne _02041B94 - bl sub_02022974 + bl GF_AssertFail _02041B94: ldr r0, [r4, #0] bl sub_0203D440 @@ -4836,7 +4836,7 @@ sub_02041C00: ; 0x02041C00 ldr r0, [r4, #0] cmp r0, #0 bne _02041C2C - bl sub_02022974 + bl GF_AssertFail _02041C2C: ldr r0, [r4, #0] ldrb r0, [r0, #0x16] @@ -6221,7 +6221,7 @@ _0204266E: ldr r0, [r6, #0] cmp r0, #0 beq _0204268A - bl sub_02022974 + bl GF_AssertFail _0204268A: add r0, r5, #0 add r0, #0x80 @@ -6257,7 +6257,7 @@ sub_020426A8: ; 0x020426A8 ldr r0, [r4, #0] cmp r0, #0 bne _020426D4 - bl sub_02022974 + bl GF_AssertFail _020426D4: ldr r0, [r4, #0] bl sub_0203D2C4 @@ -9371,7 +9371,7 @@ sub_02043EF4: ; 0x02043EF4 bl sub_0206251C add r5, r0, #0 bne _02043F32 - bl sub_02022974 + bl GF_AssertFail _02043F32: add r0, r5, #0 add r1, r4, #0 @@ -9888,7 +9888,7 @@ sub_020442B4: ; 0x020442B4 bl sub_0206251C add r4, r0, #0 bne _020442DC - bl sub_02022974 + bl GF_AssertFail _020442DC: add r0, r4, #0 mov r1, #0 @@ -9914,7 +9914,7 @@ sub_020442E8: ; 0x020442E8 bl sub_0206251C add r4, r0, #0 bne _02044310 - bl sub_02022974 + bl GF_AssertFail _02044310: add r0, r4, #0 mov r1, #1 @@ -11346,7 +11346,7 @@ _02044E22: strh r0, [r6] b _02044E3C _02044E38: - bl sub_02022974 + bl GF_AssertFail _02044E3C: mov r0, #0 pop {r4, r5, r6, pc} @@ -12305,7 +12305,7 @@ sub_02045530: ; 0x02045530 bl sub_0206251C add r7, r0, #0 bne _020455AE - bl sub_02022974 + bl GF_AssertFail _020455AE: str r6, [sp] str r4, [sp, #4] @@ -12354,7 +12354,7 @@ sub_020455C4: ; 0x020455C4 bl sub_0206251C add r5, r0, #0 bne _02045618 - bl sub_02022974 + bl GF_AssertFail _02045618: ldr r0, [r4, #0x74] add r1, r5, #0 @@ -12452,7 +12452,7 @@ _020456C6: _020456CE: cmp r4, #0x10 blt _020456D6 - bl sub_02022974 + bl GF_AssertFail _020456D6: ldr r0, [sp] add r4, #0x22 @@ -13154,7 +13154,7 @@ sub_02045C10: ; 0x02045C10 add r5, r0, #0 cmp r4, #4 bls _02045C42 - bl sub_02022974 + bl GF_AssertFail _02045C42: add r0, r5, #0 add r1, r4, #0 @@ -13276,7 +13276,7 @@ sub_02045CFC: ; 0x02045CFC ldr r0, [r4, #0] cmp r0, #0 bne _02045D3C - bl sub_02022974 + bl GF_AssertFail _02045D3C: ldr r0, [r4, #0] bl sub_0203D408 @@ -13385,7 +13385,7 @@ _02045E00: bl ov6_0224899C b _02045E0E _02045E0A: - bl sub_02022974 + bl GF_AssertFail _02045E0E: mov r0, #1 pop {r3, r4, r5, pc} @@ -13785,7 +13785,7 @@ sub_02046108: ; 0x02046108 bl sub_0206251C add r5, r0, #0 bne _02046138 - bl sub_02022974 + bl GF_AssertFail _02046138: add r0, r5, #0 add r1, r4, #0 @@ -14813,13 +14813,13 @@ _0204691A: ldr r0, [r0, #8] cmp r4, r0 beq _02046926 - bl sub_02022974 + bl GF_AssertFail _02046926: ldr r0, _02046938 ; =0x021C07E0 ldr r0, [r0, #0xc] cmp r5, r0 beq _02046932 - bl sub_02022974 + bl GF_AssertFail _02046932: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} diff --git a/asm/unk_020494DC.s b/asm/unk_020494DC.s index 7f38a63e9f..1111724792 100644 --- a/asm/unk_020494DC.s +++ b/asm/unk_020494DC.s @@ -407,7 +407,7 @@ _020497E0: bl MI_CpuFill8 b _020497F6 _020497EE: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 strh r0, [r4] _020497F6: diff --git a/asm/unk_02049D08.s b/asm/unk_02049D08.s index a99491d129..7319389a19 100644 --- a/asm/unk_02049D08.s +++ b/asm/unk_02049D08.s @@ -580,7 +580,7 @@ sub_0204A110: ; 0x0204A110 ldr r0, [r4, #0] cmp r0, #0 beq _0204A11E - bl sub_02022974 + bl GF_AssertFail _0204A11E: mov r0, #0 str r0, [r4, #0] @@ -836,7 +836,7 @@ sub_0204A32C: ; 0x0204A32C ldr r0, _0204A350 ; =0x12345678 cmp r1, r0 beq _0204A33E - bl sub_02022974 + bl GF_AssertFail _0204A33E: ldr r2, _0204A354 ; =0x000008DC add r0, r4, #0 diff --git a/asm/unk_0204AEE8.s b/asm/unk_0204AEE8.s index 7be16ceb82..c01618cdad 100644 --- a/asm/unk_0204AEE8.s +++ b/asm/unk_0204AEE8.s @@ -745,7 +745,7 @@ sub_0204B470: ; 0x0204B470 ldrb r0, [r0, #0x10] cmp r0, #4 bls _0204B49C - bl sub_02022974 + bl GF_AssertFail _0204B49C: add r0, sp, #0x80 ldrb r6, [r0, #0x10] diff --git a/asm/unk_0204B64C.s b/asm/unk_0204B64C.s index d2c27cee6b..ceff2f1139 100644 --- a/asm/unk_0204B64C.s +++ b/asm/unk_0204B64C.s @@ -217,7 +217,7 @@ _0204B7E8: bl sub_020562D8 b _0204B7F6 _0204B7F2: - bl sub_02022974 + bl GF_AssertFail _0204B7F6: mov r0, #1 pop {r4, pc} diff --git a/asm/unk_0204C500.s b/asm/unk_0204C500.s index 4950bbb652..966e16650d 100644 --- a/asm/unk_0204C500.s +++ b/asm/unk_0204C500.s @@ -40,7 +40,7 @@ _0204C536: bl sub_02056328 b _0204C54E _0204C54A: - bl sub_02022974 + bl GF_AssertFail _0204C54E: mov r0, #0 pop {r3, r4, r5, pc} @@ -133,7 +133,7 @@ _0204C5E0: bl sub_02079868 cmp r0, #0 bne _0204C610 - bl sub_02022974 + bl GF_AssertFail _0204C610: add r0, r6, #0 add r0, #0x80 diff --git a/asm/unk_0204E3CC.s b/asm/unk_0204E3CC.s index 9adcc94f43..6ed21dc3c6 100644 --- a/asm/unk_0204E3CC.s +++ b/asm/unk_0204E3CC.s @@ -101,7 +101,7 @@ sub_0204E45C: ; 0x0204E45C add r6, r0, #0 cmp r4, #8 blo _0204E48E - bl sub_02022974 + bl GF_AssertFail _0204E48E: add r5, #0x80 ldr r0, [r5, #0] @@ -127,7 +127,7 @@ sub_0204E4A4: ; 0x0204E4A4 add r4, r0, #0 cmp r4, #8 blo _0204E4C2 - bl sub_02022974 + bl GF_AssertFail _0204E4C2: add r5, #0x80 ldr r0, [r5, #0] @@ -383,7 +383,7 @@ _0204E686: strh r0, [r5] b _0204E6A8 _0204E6A4: - bl sub_02022974 + bl GF_AssertFail _0204E6A8: mov r0, #0 pop {r3, r4, r5, pc} @@ -428,7 +428,7 @@ _0204E6DE: strh r0, [r5] b _0204E6FE _0204E6FA: - bl sub_02022974 + bl GF_AssertFail _0204E6FE: mov r0, #0 pop {r3, r4, r5, pc} @@ -474,7 +474,7 @@ _0204E736: strh r0, [r5] b _0204E756 _0204E752: - bl sub_02022974 + bl GF_AssertFail _0204E756: mov r0, #0 pop {r3, r4, r5, pc} diff --git a/asm/unk_0204EDA4.s b/asm/unk_0204EDA4.s index 1e4cf1faa2..3e830a4256 100644 --- a/asm/unk_0204EDA4.s +++ b/asm/unk_0204EDA4.s @@ -59,7 +59,7 @@ sub_0204EDEC: ; 0x0204EDEC ldr r0, [r4, #0] cmp r0, #0 bne _0204EE18 - bl sub_02022974 + bl GF_AssertFail _0204EE18: ldr r0, [r4, #0] bl sub_0203D750 @@ -275,7 +275,7 @@ sub_0204EFA4: ; 0x0204EFA4 ldr r4, [r0, #0] cmp r4, #0 bne _0204EFCE - bl sub_02022974 + bl GF_AssertFail _0204EFCE: ldrb r0, [r4, #0x16] cmp r0, #0 @@ -311,7 +311,7 @@ sub_0204EFE8: ; 0x0204EFE8 ldr r4, [r0, #0] cmp r4, #0 bne _0204F012 - bl sub_02022974 + bl GF_AssertFail _0204F012: ldrb r0, [r4, #0x16] cmp r0, #0 diff --git a/asm/unk_0204F02C.s b/asm/unk_0204F02C.s index 8672c504ea..a3f3004958 100644 --- a/asm/unk_0204F02C.s +++ b/asm/unk_0204F02C.s @@ -9,7 +9,7 @@ thumb_func_start sub_0204F02C sub_0204F02C: ; 0x0204F02C push {r3, lr} - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -18,7 +18,7 @@ sub_0204F02C: ; 0x0204F02C thumb_func_start sub_0204F038 sub_0204F038: ; 0x0204F038 push {r3, lr} - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 diff --git a/asm/unk_0204F13C.s b/asm/unk_0204F13C.s index 7bfaad01bf..71d4adadc8 100644 --- a/asm/unk_0204F13C.s +++ b/asm/unk_0204F13C.s @@ -142,7 +142,7 @@ _0204F24E: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _0204F25A: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 strh r0, [r6] _0204F262: diff --git a/asm/unk_0204FAB4.s b/asm/unk_0204FAB4.s index 51ccaf3ebd..3605b68156 100644 --- a/asm/unk_0204FAB4.s +++ b/asm/unk_0204FAB4.s @@ -123,7 +123,7 @@ _0204FB98: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _0204FBA4: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 strh r0, [r6] _0204FBAC: diff --git a/asm/unk_0205003C.s b/asm/unk_0205003C.s index d8072e3924..b73ab74ae0 100644 --- a/asm/unk_0205003C.s +++ b/asm/unk_0205003C.s @@ -123,7 +123,7 @@ _02050120: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _0205012C: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 strh r0, [r6] _02050134: diff --git a/asm/unk_020507CC.s b/asm/unk_020507CC.s index 967077bf85..2251a21e6d 100644 --- a/asm/unk_020507CC.s +++ b/asm/unk_020507CC.s @@ -129,7 +129,7 @@ _0205087C: lsl r0, r0, #2 cmp r4, r0 blt _02050892 - bl sub_02022974 + bl GF_AssertFail _02050892: mov r0, #9 lsl r0, r0, #6 @@ -144,7 +144,7 @@ _0205089C: asr r4, r0, #3 cmp r4, #8 blt _020508AE - bl sub_02022974 + bl GF_AssertFail _020508AE: ldr r0, _020508B4 ; =0x021C07F4 add r0, r0, r4 @@ -164,7 +164,7 @@ sub_020508B8: ; 0x020508B8 lsl r0, r0, #4 cmp r4, r0 blt _020508CE - bl sub_02022974 + bl GF_AssertFail _020508CE: lsl r0, r4, #1 add r0, r5, r0 diff --git a/asm/unk_020508D4.s b/asm/unk_020508D4.s index 5f5e445bb2..5c71bd0438 100644 --- a/asm/unk_020508D4.s +++ b/asm/unk_020508D4.s @@ -41,7 +41,7 @@ sub_02050904: ; 0x02050904 add r6, r2, #0 cmp r0, #0 beq _02050916 - bl sub_02022974 + bl GF_AssertFail _02050916: add r0, r5, #0 add r1, r4, #0 diff --git a/asm/unk_02051B50.s b/asm/unk_02051B50.s index 0ea24a122b..fe7e984073 100644 --- a/asm/unk_02051B50.s +++ b/asm/unk_02051B50.s @@ -75,7 +75,7 @@ sub_02051BBC: ; 0x02051BBC add r4, r1, #0 cmp r5, #0x23 blo _02051BCA - bl sub_02022974 + bl GF_AssertFail _02051BCA: ldr r0, _02051BE0 ; =0x020EC208 lsl r1, r5, #2 @@ -98,7 +98,7 @@ sub_02051BE8: ; 0x02051BE8 add r4, r0, #0 cmp r4, #0x23 blo _02051BF4 - bl sub_02022974 + bl GF_AssertFail _02051BF4: ldr r0, _02051BFC ; =0x020EC20A lsl r1, r4, #2 diff --git a/asm/unk_02051D8C.s b/asm/unk_02051D8C.s index 48bc18bdac..5c05a5c419 100644 --- a/asm/unk_02051D8C.s +++ b/asm/unk_02051D8C.s @@ -387,7 +387,7 @@ _020520AC: ldr r0, [r5, #4] cmp r0, #0 bne _020520B6 - bl sub_02022974 + bl GF_AssertFail _020520B6: ldr r0, [r5, #4] bl sub_020181C4 @@ -403,7 +403,7 @@ _020520C8: ldr r0, [r0, #0] cmp r0, #0 bne _020520D6 - bl sub_02022974 + bl GF_AssertFail _020520D6: add r0, r4, #0 add r0, #0xf8 @@ -421,7 +421,7 @@ _020520F0: ldr r0, [r4, r6] cmp r0, #0 bne _020520FA - bl sub_02022974 + bl GF_AssertFail _020520FA: mov r0, #0x46 lsl r0, r0, #2 @@ -460,7 +460,7 @@ sub_0205213C: ; 0x0205213C add r6, r1, #0 cmp r4, #4 blt _0205214C - bl sub_02022974 + bl GF_AssertFail _0205214C: lsl r0, r4, #2 add r0, r5, r0 @@ -469,7 +469,7 @@ _0205214C: bl sub_0207A048 cmp r0, #0 bne _02052160 - bl sub_02022974 + bl GF_AssertFail _02052160: pop {r4, r5, r6, pc} ; .align 2, 0 @@ -483,7 +483,7 @@ sub_02052164: ; 0x02052164 add r6, r1, #0 cmp r4, #4 blt _02052174 - bl sub_02022974 + bl GF_AssertFail _02052174: lsl r1, r4, #2 add r1, r5, r1 @@ -502,7 +502,7 @@ sub_02052184: ; 0x02052184 add r6, r1, #0 cmp r4, #4 blt _02052194 - bl sub_02022974 + bl GF_AssertFail _02052194: lsl r1, r4, #2 add r1, r5, r1 @@ -1271,7 +1271,7 @@ _02052804: ldr r0, [r0, r1] pop {r3, r4, r5, pc} _02052810: - bl sub_02022974 + bl GF_AssertFail mov r0, #0x18 pop {r3, r4, r5, pc} ; .align 2, 0 diff --git a/asm/unk_020528D0.s b/asm/unk_020528D0.s index bdffea999a..ad22e63736 100644 --- a/asm/unk_020528D0.s +++ b/asm/unk_020528D0.s @@ -48,7 +48,7 @@ sub_02052914: ; 0x02052914 bl sub_02018144 add r4, r0, #0 bne _0205292A - bl sub_02022974 + bl GF_AssertFail _0205292A: add r0, r4, #0 mov r1, #0 diff --git a/asm/unk_020530C8.s b/asm/unk_020530C8.s index cff3b34be6..1e13a57e5e 100644 --- a/asm/unk_020530C8.s +++ b/asm/unk_020530C8.s @@ -131,7 +131,7 @@ sub_020531A0: ; 0x020531A0 ldr r0, [r4, #0x70] cmp r0, #5 blt _020531AE - bl sub_02022974 + bl GF_AssertFail _020531AE: ldr r0, [r4, #0x74] ldr r0, [r0, #0] @@ -218,7 +218,7 @@ _02053246: bl sub_0203A188 cmp r4, r0 beq _02053278 - bl sub_02022974 + bl GF_AssertFail b _02053278 _0205326A: add r0, r7, #0 @@ -395,7 +395,7 @@ sub_020533CC: ; 0x020533CC ldr r0, [r4, #0x5c] cmp r0, #0 beq _020533DE - bl sub_02022974 + bl GF_AssertFail _020533DE: ldr r0, [r4, #0x1c] ldr r1, [r4, #0x2c] @@ -422,7 +422,7 @@ _02053414: ldr r0, [r4, #0x70] cmp r0, #5 blt _0205341E - bl sub_02022974 + bl GF_AssertFail _0205341E: ldr r0, [r4, #0x70] ldr r1, _02053464 ; =0x020EC3A8 @@ -468,7 +468,7 @@ sub_02053468: ; 0x02053468 ldr r0, [r4, #0x5c] cmp r0, #0 bne _02053476 - bl sub_02022974 + bl GF_AssertFail _02053476: mov r0, #0 str r0, [r4, #0x5c] @@ -1136,7 +1136,7 @@ sub_020539A0: ; 0x020539A0 bl sub_0203CD4C cmp r0, #0 beq _020539C6 - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _020539C6: mov r0, #0 @@ -1514,7 +1514,7 @@ sub_02053C70: ; 0x02053C70 bl sub_0203CD4C cmp r0, #0 bne _02053C92 - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} _02053C92: ldr r0, [r5, #0x3c] @@ -1647,7 +1647,7 @@ _02053D8A: bl sub_020705A4 b _02053D9A _02053D96: - bl sub_02022974 + bl GF_AssertFail _02053D9A: add r0, r7, #0 bl sub_02053DF0 @@ -1773,7 +1773,7 @@ sub_02053E5C: ; 0x02053E5C bl sub_0203CD4C cmp r0, #0 bne _02053E7E - bl sub_02022974 + bl GF_AssertFail pop {r4, r5, r6, pc} _02053E7E: ldr r2, [r6, #4] @@ -1977,11 +1977,11 @@ _02053FE4: sub r4, r0, #6 cmp r6, #0 bge _02054014 - bl sub_02022974 + bl GF_AssertFail _02054014: cmp r4, #0 bge _0205401C - bl sub_02022974 + bl GF_AssertFail _0205401C: lsr r2, r6, #0x1f lsl r1, r6, #0x1f @@ -2493,7 +2493,7 @@ _02054434: ldr r0, _02054448 ; =sub_0205430C pop {r3, pc} _0205443C: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -2603,7 +2603,7 @@ sub_020544F0: ; 0x020544F0 bl sub_0203CD4C cmp r0, #0 beq _02054516 - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _02054516: mov r0, #0 diff --git a/asm/unk_02054884.s b/asm/unk_02054884.s index b3043507c9..989a536c13 100644 --- a/asm/unk_02054884.s +++ b/asm/unk_02054884.s @@ -254,7 +254,7 @@ _02054A66: cmp r4, r5 blt _02054A50 _02054A6C: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} thumb_func_end sub_02054A40 diff --git a/asm/unk_02054BD0.s b/asm/unk_02054BD0.s index 6f5c40c36b..872dadb07e 100644 --- a/asm/unk_02054BD0.s +++ b/asm/unk_02054BD0.s @@ -167,7 +167,7 @@ _02054CE0: _02054CEA: cmp r4, #0x10 blo _02054CF2 - bl sub_02022974 + bl GF_AssertFail _02054CF2: lsl r0, r4, #1 strh r5, [r6, r0] diff --git a/asm/unk_02054D00.s b/asm/unk_02054D00.s index 8e205e13d8..90dbc128ff 100644 --- a/asm/unk_02054D00.s +++ b/asm/unk_02054D00.s @@ -328,7 +328,7 @@ _02054F50: str r1, [r0, #0] pop {r3, pc} _02054F5A: - bl sub_02022974 + bl GF_AssertFail pop {r3, pc} ; .align 2, 0 _02054F60: .word 0x020EC3D0 @@ -441,7 +441,7 @@ _02055008: blt _0205501C cmp r4, #0 bne _0205501E - bl sub_02022974 + bl GF_AssertFail b _0205501E _0205501C: mov r4, #0 @@ -582,7 +582,7 @@ sub_020550F4: ; 0x020550F4 cmp r7, #0 bge _0205511C _02055118: - bl sub_02022974 + bl GF_AssertFail _0205511C: lsl r0, r6, #0x10 str r0, [r5, #0] diff --git a/asm/unk_02055808.s b/asm/unk_02055808.s index 62c30c1239..ebc5f5a090 100644 --- a/asm/unk_02055808.s +++ b/asm/unk_02055808.s @@ -30,7 +30,7 @@ sub_02055820: ; 0x02055820 bl sub_0203CD4C cmp r0, #0 bne _02055838 - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} _02055838: add r0, r4, #0 @@ -68,7 +68,7 @@ sub_02055868: ; 0x02055868 bl sub_0203CD4C cmp r0, #0 beq _02055880 - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} _02055880: add r0, r4, #0 @@ -105,7 +105,7 @@ sub_020558AC: ; 0x020558AC bl sub_0203CD4C cmp r0, #0 bne _020558C6 - bl sub_02022974 + bl GF_AssertFail add sp, #0xc pop {r3, r4, pc} _020558C6: @@ -139,7 +139,7 @@ sub_020558F0: ; 0x020558F0 bl sub_0203CD4C cmp r0, #0 bne _0205590A - bl sub_02022974 + bl GF_AssertFail add sp, #0xc pop {r3, r4, pc} _0205590A: diff --git a/asm/unk_02055C50.s b/asm/unk_02055C50.s index 1d7f8d87c0..18a65b1c3c 100644 --- a/asm/unk_02055C50.s +++ b/asm/unk_02055C50.s @@ -541,7 +541,7 @@ _0205603E: add r4, r4, #1 b _0205604A _02056046: - bl sub_02022974 + bl GF_AssertFail _0205604A: add r0, r7, #0 add r1, r6, #0 @@ -617,7 +617,7 @@ _020560C8: add r4, r4, #1 b _020560D4 _020560D0: - bl sub_02022974 + bl GF_AssertFail _020560D4: ldr r0, [r5, #0x38] add r1, r7, #0 diff --git a/asm/unk_020562F8.s b/asm/unk_020562F8.s index aaa391a41b..8eeea367ea 100644 --- a/asm/unk_020562F8.s +++ b/asm/unk_020562F8.s @@ -163,7 +163,7 @@ sub_02056400: ; 0x02056400 cmp r5, r0 bls _02056414 _02056410: - bl sub_02022974 + bl GF_AssertFail _02056414: mov r3, #6 add r0, r4, #0 @@ -276,7 +276,7 @@ sub_020564D0: ; 0x020564D0 lsr r5, r0, #0x10 cmp r5, #0xa blo _020564EA - bl sub_02022974 + bl GF_AssertFail _020564EA: add r0, r5, #5 str r0, [r4, #0x38] @@ -385,7 +385,7 @@ _02056592: lsl r0, r0, #0x10 lsr r0, r0, #0x10 bne _020565A0 - bl sub_02022974 + bl GF_AssertFail _020565A0: add r0, r6, #0 add r0, #0x14 @@ -417,7 +417,7 @@ _020565B0: lsr r0, r0, #0x10 cmp r4, r0 blo _020565E4 - bl sub_02022974 + bl GF_AssertFail _020565E4: cmp r4, #0x14 bge _020565EC @@ -449,7 +449,7 @@ _02056610: add r0, #8 cmp r1, #6 blt _020565F2 - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -476,7 +476,7 @@ _02056634: strb r1, [r0] pop {r4, pc} _02056646: - bl sub_02022974 + bl GF_AssertFail _0205664A: pop {r4, pc} thumb_func_end sub_02056624 diff --git a/asm/unk_02056720.s b/asm/unk_02056720.s index 0a26f52272..538ecc4924 100644 --- a/asm/unk_02056720.s +++ b/asm/unk_02056720.s @@ -140,7 +140,7 @@ sub_020567F0: ; 0x020567F0 cmp r4, #0x19 blt _02056802 _020567FE: - bl sub_02022974 + bl GF_AssertFail _02056802: mov r0, #1 ldrsb r1, [r5, r0] @@ -236,7 +236,7 @@ sub_02056888: ; 0x02056888 push {r4, lr} add r4, r0, #0 bne _02056892 - bl sub_02022974 + bl GF_AssertFail _02056892: ldrb r0, [r4] lsl r0, r0, #0x1a @@ -252,11 +252,11 @@ sub_0205689C: ; 0x0205689C add r4, r1, #0 cmp r5, #0 bne _020568AA - bl sub_02022974 + bl GF_AssertFail _020568AA: cmp r4, #8 blo _020568B2 - bl sub_02022974 + bl GF_AssertFail _020568B2: ldrb r1, [r5] mov r0, #0x38 @@ -442,7 +442,7 @@ sub_020569C4: ; 0x020569C4 add r7, r3, #0 cmp r4, #6 blt _020569D6 - bl sub_02022974 + bl GF_AssertFail _020569D6: lsl r1, r4, #1 add r0, r5, r1 @@ -464,7 +464,7 @@ sub_020569E8: ; 0x020569E8 add r7, r3, #0 cmp r4, #6 blt _020569FA - bl sub_02022974 + bl GF_AssertFail _020569FA: lsl r1, r4, #1 add r0, r5, r1 @@ -599,7 +599,7 @@ sub_02056AC8: ; 0x02056AC8 str r3, [sp] cmp r4, #0xc blt _02056ADA - bl sub_02022974 + bl GF_AssertFail _02056ADA: add r6, r5, #0 lsl r4, r4, #3 @@ -607,7 +607,7 @@ _02056ADA: ldrh r0, [r6, r4] cmp r0, #0 bne _02056AEA - bl sub_02022974 + bl GF_AssertFail _02056AEA: ldrh r0, [r6, r4] str r0, [r7, #0] @@ -627,7 +627,7 @@ sub_02056AFC: ; 0x02056AFC add r5, r0, #0 cmp r4, #0xc blt _02056B0A - bl sub_02022974 + bl GF_AssertFail _02056B0A: lsl r4, r4, #3 add r0, r5, r4 @@ -635,7 +635,7 @@ _02056B0A: ldrh r0, [r0] cmp r0, #0 bne _02056B1A - bl sub_02022974 + bl GF_AssertFail _02056B1A: add r0, r5, r4 add r0, #0xbc diff --git a/asm/unk_02056B30.s b/asm/unk_02056B30.s index b49dbbbdb6..718ad1a878 100644 --- a/asm/unk_02056B30.s +++ b/asm/unk_02056B30.s @@ -175,7 +175,7 @@ _02056C70: mov r4, #6 b _02056CE6 _02056C7E: - bl sub_02022974 + bl GF_AssertFail b _02056CE6 _02056C84: ldr r0, [sp, #8] @@ -196,7 +196,7 @@ _02056C9C: mov r4, #6 b _02056CE6 _02056CAA: - bl sub_02022974 + bl GF_AssertFail b _02056CE6 _02056CB0: ldr r0, [sp, #8] @@ -218,10 +218,10 @@ _02056CD2: bl sub_0203A274 cmp r0, #0 bne _02056CE6 - bl sub_02022974 + bl GF_AssertFail b _02056CE6 _02056CE2: - bl sub_02022974 + bl GF_AssertFail _02056CE6: ldr r1, _02056CF8 ; =sub_02056CFC add r0, r7, #0 @@ -550,7 +550,7 @@ _02056F62: bl sub_02065638 b _02056F72 _02056F6E: - bl sub_02022974 + bl GF_AssertFail _02056F72: ldr r0, [r4, #4] add r0, r0, #1 @@ -926,7 +926,7 @@ _02057266: bl sub_02065638 b _02057278 _02057274: - bl sub_02022974 + bl GF_AssertFail _02057278: ldr r0, [r4, #4] add r0, r0, #1 diff --git a/asm/unk_02057518.s b/asm/unk_02057518.s index fff26edae6..81db4f560b 100644 --- a/asm/unk_02057518.s +++ b/asm/unk_02057518.s @@ -1049,7 +1049,7 @@ _02057CF4: bl sub_0205E7D0 add r7, r0, #0 bne _02057D2E - bl sub_02022974 + bl GF_AssertFail _02057D2E: ldr r0, _02057DAC ; =0x021C0848 ldr r0, [r0, #0] @@ -1447,11 +1447,11 @@ sub_02058018: ; 0x02058018 beq _02058054 cmp r1, #1 beq _0205802E - bl sub_02022974 + bl GF_AssertFail _0205802E: cmp r5, #8 blt _02058036 - bl sub_02022974 + bl GF_AssertFail _02058036: ldrb r0, [r4] mov r1, #1 @@ -1463,7 +1463,7 @@ _02058036: _02058044: cmp r1, #0 bne _0205804C - bl sub_02022974 + bl GF_AssertFail _0205804C: ldrb r1, [r4] add r0, r5, #0 @@ -1699,7 +1699,7 @@ sub_020581E0: ; 0x020581E0 cmp r4, #5 str r0, [r2, #0] blt _020581FE - bl sub_02022974 + bl GF_AssertFail _020581FE: lsl r1, r4, #2 add r0, sp, #0 @@ -2108,7 +2108,7 @@ _020584CA: bl sub_02054F68 cmp r0, #0 beq _0205852C - bl sub_02022974 + bl GF_AssertFail _0205852C: pop {r3, r4, r5, r6, r7, pc} nop @@ -4028,7 +4028,7 @@ _02059342: mov r0, #2 pop {r3, pc} _0205934A: - bl sub_02022974 + bl GF_AssertFail mov r0, #2 pop {r3, pc} ; .align 2, 0 diff --git a/asm/unk_0205964C.s b/asm/unk_0205964C.s index f6f4874a55..1bd1cb80fb 100644 --- a/asm/unk_0205964C.s +++ b/asm/unk_0205964C.s @@ -1140,7 +1140,7 @@ sub_02059EBC: ; 0x02059EBC add r4, r0, #0 cmp r4, #4 blt _02059EC8 - bl sub_02022974 + bl GF_AssertFail _02059EC8: ldr r0, _02059ED4 ; =0x021C084C ldr r1, [r0, #0] diff --git a/asm/unk_0205B33C.s b/asm/unk_0205B33C.s index ce99bcdfdc..765d127736 100644 --- a/asm/unk_0205B33C.s +++ b/asm/unk_0205B33C.s @@ -11,7 +11,7 @@ sub_0205B33C: ; 0x0205B33C push {r3, r4, r5, lr} add r4, r0, #0 bne _0205B346 - bl sub_02022974 + bl GF_AssertFail _0205B346: ldr r0, [r4, #0x7c] cmp r0, #0 @@ -1107,7 +1107,7 @@ sub_0205BAE8: ; 0x0205BAE8 mvn r0, r0 cmp r4, r0 bne _0205BB0A - bl sub_02022974 + bl GF_AssertFail b _0205BB0A _0205BB08: add r5, r4, #0 @@ -1510,7 +1510,7 @@ _0205BDFC: ldr r0, [r0, r1] pop {r4, r5, r6, pc} _0205BE04: - bl sub_02022974 + bl GF_AssertFail mov r0, #0x28 pop {r4, r5, r6, pc} ; .align 2, 0 @@ -1536,7 +1536,7 @@ sub_0205BE38: ; 0x0205BE38 bl sub_02032EE8 add r4, r0, #0 bne _0205BE4E - bl sub_02022974 + bl GF_AssertFail _0205BE4E: add r0, r4, #0 bl sub_02025FCC diff --git a/asm/unk_0205C22C.s b/asm/unk_0205C22C.s index 776f6c60a3..f88ecdd28c 100644 --- a/asm/unk_0205C22C.s +++ b/asm/unk_0205C22C.s @@ -414,7 +414,7 @@ sub_0205C51C: ; 0x0205C51C str r1, [sp, #4] cmp r0, #0 bne _0205C52E - bl sub_02022974 + bl GF_AssertFail _0205C52E: ldr r0, [sp] ldr r0, [r0, #8] @@ -434,7 +434,7 @@ _0205C54A: bl sub_0206251C add r5, r0, #0 bne _0205C55A - bl sub_02022974 + bl GF_AssertFail _0205C55A: ldrb r0, [r4, #0xd] cmp r0, #4 @@ -775,7 +775,7 @@ _0205C7F0: bl sub_0206251C add r4, r0, #0 bne _0205C800 - bl sub_02022974 + bl GF_AssertFail _0205C800: add r0, r4, #0 mov r1, #1 @@ -802,7 +802,7 @@ sub_0205C820: ; 0x0205C820 bl sub_0206251C add r4, r0, #0 bne _0205C834 - bl sub_02022974 + bl GF_AssertFail _0205C834: add r0, r4, #0 bl sub_020655F4 @@ -826,7 +826,7 @@ _0205C852: bl sub_0206251C add r4, r0, #0 bne _0205C868 - bl sub_02022974 + bl GF_AssertFail _0205C868: ldrb r1, [r5, #8] add r0, r4, #0 diff --git a/asm/unk_0205C980.s b/asm/unk_0205C980.s index 172d48aa7a..eb287f7456 100644 --- a/asm/unk_0205C980.s +++ b/asm/unk_0205C980.s @@ -119,7 +119,7 @@ _0205CA32: ldr r0, [r0, r1] pop {r4, pc} _0205CA3C: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 _0205CA42: pop {r4, pc} diff --git a/asm/unk_0205CA94.s b/asm/unk_0205CA94.s index 532a31c645..a1d514b455 100644 --- a/asm/unk_0205CA94.s +++ b/asm/unk_0205CA94.s @@ -1180,7 +1180,7 @@ sub_0205D344: ; 0x0205D344 bl sub_02021AA0 add r4, r0, #0 bne _0205D3A0 - bl sub_02022974 + bl GF_AssertFail _0205D3A0: add r0, r4, #0 add sp, #0x30 diff --git a/asm/unk_0205DFC4.s b/asm/unk_0205DFC4.s index 3b9314fc78..bc64d42de5 100644 --- a/asm/unk_0205DFC4.s +++ b/asm/unk_0205DFC4.s @@ -896,7 +896,7 @@ _0205E5A6: b _0205E5B0 _0205E5AA: mov r4, #2 - bl sub_02022974 + bl GF_AssertFail _0205E5B0: add r0, r4, #0 pop {r4, pc} @@ -1105,7 +1105,7 @@ sub_0205E6B8: ; 0x0205E6B8 bl sub_02032EE8 add r4, r0, #0 bne _0205E6CE - bl sub_02022974 + bl GF_AssertFail _0205E6CE: add r0, r4, #0 bl sub_02025FCC @@ -1235,7 +1235,7 @@ _0205E784: mov r4, #0x71 b _0205E78C _0205E788: - bl sub_02022974 + bl GF_AssertFail _0205E78C: add r0, r4, #0 pop {r4, pc} @@ -1279,7 +1279,7 @@ _0205E7C4: mov r4, #0x70 b _0205E7CC _0205E7C8: - bl sub_02022974 + bl GF_AssertFail _0205E7CC: add r0, r4, #0 pop {r4, pc} diff --git a/asm/unk_0205E7D0.s b/asm/unk_0205E7D0.s index 4759b11483..0a48172e8a 100644 --- a/asm/unk_0205E7D0.s +++ b/asm/unk_0205E7D0.s @@ -101,7 +101,7 @@ sub_0205E884: ; 0x0205E884 bl sub_0205EB3C add r6, r0, #0 bne _0205E896 - bl sub_02022974 + bl GF_AssertFail _0205E896: add r0, r6, #0 bl sub_02062A40 @@ -162,7 +162,7 @@ sub_0205E8FC: ; 0x0205E8FC bl sub_02018144 add r4, r0, #0 bne _0205E90E - bl sub_02022974 + bl GF_AssertFail _0205E90E: add r0, r4, #0 mov r1, #0 @@ -233,7 +233,7 @@ sub_0205E988: ; 0x0205E988 bl sub_020619DC add r5, r0, #0 bne _0205E9A8 - bl sub_02022974 + bl GF_AssertFail _0205E9A8: add r0, r5, #0 mov r1, #0xff @@ -327,7 +327,7 @@ sub_0205EA64: ; 0x0205EA64 bl sub_0205EA24 add r4, r0, #0 bne _0205EA72 - bl sub_02022974 + bl GF_AssertFail _0205EA72: add r0, r4, #0 pop {r4, pc} @@ -479,12 +479,12 @@ sub_0205EB3C: ; 0x0205EB3C push {r4, lr} add r4, r0, #0 bne _0205EB46 - bl sub_02022974 + bl GF_AssertFail _0205EB46: ldr r0, [r4, #0x30] cmp r0, #0 bne _0205EB50 - bl sub_02022974 + bl GF_AssertFail _0205EB50: ldr r0, [r4, #0x30] pop {r4, pc} @@ -503,7 +503,7 @@ sub_0205EB58: ; 0x0205EB58 add r5, r0, #0 cmp r4, #6 blt _0205EB66 - bl sub_02022974 + bl GF_AssertFail _0205EB66: add r0, r5, #0 add r1, r4, #0 @@ -518,7 +518,7 @@ sub_0205EB74: ; 0x0205EB74 push {r4, lr} add r4, r0, #0 bne _0205EB7E - bl sub_02022974 + bl GF_AssertFail _0205EB7E: ldr r0, [r4, #0x1c] pop {r4, pc} @@ -1114,7 +1114,7 @@ _0205EEA2: ldr r0, _0205EED4 ; =0x00000113 pop {r3, pc} _0205EEA6: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} nop @@ -1188,7 +1188,7 @@ _0205EF2C: lsl r0, r0, #8 pop {r3, pc} _0205EF32: - bl sub_02022974 + bl GF_AssertFail mov r0, #1 pop {r3, pc} ; .align 2, 0 @@ -1486,7 +1486,7 @@ _0205F0F4: bl sub_0205EB9C pop {r3, r4, r5, pc} _0205F100: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} ; .align 2, 0 thumb_func_end sub_0205F098 diff --git a/asm/unk_0205F180.s b/asm/unk_0205F180.s index 3d5af30ef8..d4ad0e52eb 100644 --- a/asm/unk_0205F180.s +++ b/asm/unk_0205F180.s @@ -1274,7 +1274,7 @@ _0205FBC4: add sp, #0xc pop {r4, r5, r6, r7, pc} _0205FBDA: - bl sub_02022974 + bl GF_AssertFail add sp, #0xc pop {r4, r5, r6, r7, pc} ; .align 2, 0 @@ -1368,7 +1368,7 @@ _0205FC7C: mov r0, #2 pop {r3, pc} _0205FC80: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} thumb_func_end sub_0205FC64 @@ -2448,7 +2448,7 @@ _020604D6: mov r0, #1 pop {r3, pc} _020604DA: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -2882,7 +2882,7 @@ _02060842: mov r0, #1 pop {r3, pc} _02060846: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 @@ -4444,7 +4444,7 @@ _0206145A: b _02061476 _02061470: mov r4, #0 - bl sub_02022974 + bl GF_AssertFail _02061476: add r0, r4, #0 pop {r3, r4, r5, pc} diff --git a/asm/unk_02061804.s b/asm/unk_02061804.s index 53f12a32cb..58603f5f36 100644 --- a/asm/unk_02061804.s +++ b/asm/unk_02061804.s @@ -114,7 +114,7 @@ sub_020618C8: ; 0x020618C8 bl sub_02018144 add r5, r0, #0 bne _020618DE - bl sub_02022974 + bl GF_AssertFail _020618DE: mov r2, #0x4b add r0, r5, #0 @@ -130,7 +130,7 @@ _020618DE: bl sub_02018144 add r4, r0, #0 bne _02061902 - bl sub_02022974 + bl GF_AssertFail _02061902: add r0, r4, #0 mov r1, #0 @@ -483,7 +483,7 @@ sub_02061BF0: ; 0x02061BF0 bl sub_02062CA8 cmp r0, #1 beq _02061C00 - bl sub_02022974 + bl GF_AssertFail _02061C00: add r0, r5, #0 mov r4, #0 @@ -526,7 +526,7 @@ sub_02061C48: ; 0x02061C48 bl sub_02062CA8 cmp r0, #1 beq _02061C58 - bl sub_02022974 + bl GF_AssertFail _02061C58: add r0, r5, #0 mov r4, #0 @@ -592,7 +592,7 @@ _02061CC8: add r5, #0x50 cmp r4, #0 bgt _02061CDE - bl sub_02022974 + bl GF_AssertFail _02061CDE: add r0, r6, #0 add r1, sp, #0 @@ -631,7 +631,7 @@ _02061D0E: bl sub_02062120 add r4, r0, #0 bne _02061D24 - bl sub_02022974 + bl GF_AssertFail _02061D24: add r0, r4, #0 add r1, r5, #0 @@ -1010,7 +1010,7 @@ sub_02062068: ; 0x02062068 str r1, [sp] cmp r5, #0 bne _0206207C - bl sub_02022974 + bl GF_AssertFail _0206207C: lsl r0, r5, #5 str r0, [sp, #4] @@ -1019,7 +1019,7 @@ _0206207C: bl sub_02018184 add r6, r0, #0 bne _02062090 - bl sub_02022974 + bl GF_AssertFail _02062090: ldr r2, [sp, #4] add r0, r6, #0 @@ -1030,7 +1030,7 @@ _02062090: bl sub_02018184 add r4, r0, #0 bne _020620AA - bl sub_02022974 + bl GF_AssertFail _020620AA: ldr r0, [sp] str r0, [r4, #0] @@ -1073,7 +1073,7 @@ _020620EC: bl sub_02061918 cmp r0, #0 bne _020620FE - bl sub_02022974 + bl GF_AssertFail _020620FE: ldr r0, [r6, #0] add r4, #0x20 @@ -1188,7 +1188,7 @@ _020621C6: bl sub_0200D9E8 add r5, r0, #0 bne _020621D8 - bl sub_02022974 + bl GF_AssertFail _020621D8: add r0, r4, #0 add r1, r5, #0 @@ -1574,7 +1574,7 @@ sub_0206251C: ; 0x0206251C add r6, r1, #0 cmp r5, #0 bne _0206252A - bl sub_02022974 + bl GF_AssertFail _0206252A: add r0, r5, #0 bl sub_02062824 @@ -1818,7 +1818,7 @@ sub_020626D0: ; 0x020626D0 bl sub_02062E94 cmp r0, #1 beq _020626E4 - bl sub_02022974 + bl GF_AssertFail _020626E4: add r0, r5, #0 mov r1, #0 @@ -1850,7 +1850,7 @@ sub_02062714: ; 0x02062714 bl sub_020631D8 cmp r0, #1 beq _0206272A - bl sub_02022974 + bl GF_AssertFail _0206272A: add r0, r5, #0 mov r1, #1 @@ -2131,7 +2131,7 @@ sub_020628A0: ; 0x020628A0 ldr r0, [r4, #0x14] cmp r0, #0 bne _020628AE - bl sub_02022974 + bl GF_AssertFail _020628AE: ldr r0, [r4, #0x14] pop {r4, pc} @@ -2423,7 +2423,7 @@ _020629CC: str r1, [r0, #0x40] pop {r3, pc} _020629D0: - bl sub_02022974 + bl GF_AssertFail pop {r3, pc} ; .align 2, 0 thumb_func_end sub_020629B4 @@ -2448,7 +2448,7 @@ _020629F0: ldr r0, [r0, #0x40] pop {r3, pc} _020629F4: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} thumb_func_end sub_020629D8 @@ -2550,7 +2550,7 @@ sub_02062A54: ; 0x02062A54 add r4, r0, #0 cmp r5, #0x10 ble _02062A62 - bl sub_02022974 + bl GF_AssertFail _02062A62: add r0, r4, #0 bl sub_02062A78 @@ -2576,7 +2576,7 @@ sub_02062A7C: ; 0x02062A7C add r4, r0, #0 cmp r5, #0x10 ble _02062A8A - bl sub_02022974 + bl GF_AssertFail _02062A8A: add r0, r4, #0 bl sub_02062AA0 @@ -2602,7 +2602,7 @@ sub_02062AA4: ; 0x02062AA4 add r4, r0, #0 cmp r5, #0x10 ble _02062AB2 - bl sub_02022974 + bl GF_AssertFail _02062AB2: add r0, r4, #0 bl sub_02062AC8 @@ -2628,7 +2628,7 @@ sub_02062ACC: ; 0x02062ACC add r4, r0, #0 cmp r5, #0x20 ble _02062ADA - bl sub_02022974 + bl GF_AssertFail _02062ADA: add r0, r4, #0 bl sub_02062AF0 @@ -2906,7 +2906,7 @@ sub_02062C18: ; 0x02062C18 bl sub_02062E94 cmp r0, #1 beq _02062C28 - bl sub_02022974 + bl GF_AssertFail _02062C28: add r0, r4, #0 bl sub_02062958 @@ -3900,7 +3900,7 @@ _02063144: strh r1, [r0, #0x12] pop {r3, pc} _02063148: - bl sub_02022974 + bl GF_AssertFail pop {r3, pc} ; .align 2, 0 thumb_func_end sub_0206312C @@ -3925,7 +3925,7 @@ _02063168: ldrh r0, [r0, #0x12] pop {r3, pc} _0206316C: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} thumb_func_end sub_02063150 @@ -4049,7 +4049,7 @@ sub_020631F4: ; 0x020631F4 bl sub_020631D8 cmp r0, #1 beq _02063204 - bl sub_02022974 + bl GF_AssertFail _02063204: add r0, r4, #0 bl sub_02063114 @@ -4062,7 +4062,7 @@ sub_0206320C: ; 0x0206320C add r4, r0, #0 cmp r4, #0x44 blo _02063218 - bl sub_02022974 + bl GF_AssertFail _02063218: ldr r0, _02063220 ; =0x020EE3A8 lsl r1, r4, #2 @@ -4136,7 +4136,7 @@ _02063254: ldr r2, [r3, #0] cmp r2, r1 bne _0206324A - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} ; .align 2, 0 diff --git a/asm/unk_0206450C.s b/asm/unk_0206450C.s index 5671e95eec..7c9de8310b 100644 --- a/asm/unk_0206450C.s +++ b/asm/unk_0206450C.s @@ -510,7 +510,7 @@ _02064880: str r0, [r4, #0xc] pop {r3, r4, r5, r6, r7, pc} _02064894: - bl sub_02022974 + bl GF_AssertFail add sp, #8 pop {r3, r4, r5, r6, r7, pc} thumb_func_end sub_020647A0 @@ -830,7 +830,7 @@ _02064AB2: mvn r0, r0 cmp r1, r0 bne _02064AC2 - bl sub_02022974 + bl GF_AssertFail _02064AC2: add r4, r4, #1 lsl r0, r4, #2 @@ -993,7 +993,7 @@ _02064BCE: mvn r0, r0 cmp r1, r0 bne _02064BDE - bl sub_02022974 + bl GF_AssertFail _02064BDE: add r4, r4, #1 lsl r0, r4, #2 @@ -1980,7 +1980,7 @@ _020652F6: _02065300: cmp r4, #0 bne _02065308 - bl sub_02022974 + bl GF_AssertFail _02065308: add r0, r4, #0 pop {r4, pc} @@ -2040,7 +2040,7 @@ _02065366: ldr r2, [r1, #0] cmp r2, #0x27 bne _0206535E - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} nop @@ -2336,7 +2336,7 @@ _02065582: _02065592: cmp r4, #4 blt _0206559A - bl sub_02022974 + bl GF_AssertFail _0206559A: add r0, r4, #1 lsr r2, r0, #0x1f diff --git a/asm/unk_020655F4.s b/asm/unk_020655F4.s index 8175e34876..a2ee284100 100644 --- a/asm/unk_020655F4.s +++ b/asm/unk_020655F4.s @@ -50,7 +50,7 @@ sub_02065638: ; 0x02065638 add r5, r0, #0 cmp r4, #0x9a blt _02065646 - bl sub_02022974 + bl GF_AssertFail _02065646: add r0, r5, #0 add r1, r4, #0 @@ -161,7 +161,7 @@ sub_02065700: ; 0x02065700 bl sub_02018184 add r4, r0, #0 bne _02065716 - bl sub_02022974 + bl GF_AssertFail _02065716: add r2, r4, #0 mov r1, #0x14 @@ -180,7 +180,7 @@ _0206571C: bl sub_0200D9E8 add r7, r0, #0 bne _02065740 - bl sub_02022974 + bl GF_AssertFail _02065740: str r5, [r4, #0xc] str r6, [r4, #0x10] @@ -209,7 +209,7 @@ sub_02065758: ; 0x02065758 bl sub_02065684 cmp r0, #1 beq _02065770 - bl sub_02022974 + bl GF_AssertFail _02065770: ldr r0, [r4, #0xc] bl sub_020656AC @@ -346,7 +346,7 @@ sub_02065838: ; 0x02065838 add r4, r1, #0 cmp r7, #4 blt _02065846 - bl sub_02022974 + bl GF_AssertFail _02065846: ldr r3, _02065878 ; =0x020EE31C ldr r6, [r3, #0] @@ -373,7 +373,7 @@ _02065860: cmp r6, #0 bne _02065850 _02065870: - bl sub_02022974 + bl GF_AssertFail add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -3785,7 +3785,7 @@ sub_02066F88: ; 0x02066F88 ldrb r0, [r0, #0x18] cmp r0, #2 bls _02067014 - bl sub_02022974 + bl GF_AssertFail _02067014: cmp r4, #0 beq _0206705E diff --git a/asm/unk_020673B8.s b/asm/unk_020673B8.s index f80d25d955..717a72c3ba 100644 --- a/asm/unk_020673B8.s +++ b/asm/unk_020673B8.s @@ -515,7 +515,7 @@ _02067726: _02067736: cmp r5, #4 blt _0206773E - bl sub_02022974 + bl GF_AssertFail _0206773E: add r0, r5, #1 lsr r2, r0, #0x1f diff --git a/asm/unk_020677F4.s b/asm/unk_020677F4.s index 0b6e06d19a..d2879bbeb5 100644 --- a/asm/unk_020677F4.s +++ b/asm/unk_020677F4.s @@ -330,7 +330,7 @@ _02067A44: ldr r0, [r2, #8] pop {r3, pc} _02067A48: - bl sub_02022974 + bl GF_AssertFail ldr r0, _02067A50 ; =0x0000FFFF pop {r3, pc} ; .align 2, 0 @@ -347,7 +347,7 @@ sub_02067A58: ; 0x02067A58 bl sub_020677F4 cmp r0, #0 bne _02067A6E - bl sub_02022974 + bl GF_AssertFail _02067A6E: add r0, r5, #0 bl sub_02062D4C diff --git a/asm/unk_02067A84.s b/asm/unk_02067A84.s index 0621545fbc..f7d6d4e349 100644 --- a/asm/unk_02067A84.s +++ b/asm/unk_02067A84.s @@ -142,7 +142,7 @@ _02067B3C: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _02067B9A: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 add sp, #0x58 pop {r3, r4, r5, r6, r7, pc} @@ -670,7 +670,7 @@ _02067F6C: cmp r0, #0 bne _02067F4C _02067F7C: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -725,7 +725,7 @@ sub_02067FD4: ; 0x02067FD4 push {r4, lr} add r4, r0, #0 bne _02067FDE - bl sub_02022974 + bl GF_AssertFail _02067FDE: add r0, r4, #0 bl sub_02068048 @@ -753,7 +753,7 @@ sub_02067FF0: ; 0x02067FF0 bl sub_02018184 add r4, r0, #0 bne _0206800A - bl sub_02022974 + bl GF_AssertFail _0206800A: add r0, r4, #0 mov r1, #0 @@ -778,7 +778,7 @@ _0206800A: bl sub_0200D9E8 add r4, r0, #0 bne _02068040 - bl sub_02022974 + bl GF_AssertFail _02068040: add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} @@ -924,7 +924,7 @@ _0206812A: mvn r0, r0 cmp r1, r0 bne _02068138 - bl sub_02022974 + bl GF_AssertFail _02068138: ldr r0, [r4, #8] mov r1, #0 diff --git a/asm/unk_0206940C.s b/asm/unk_0206940C.s index cd378ea44d..6021865ecb 100644 --- a/asm/unk_0206940C.s +++ b/asm/unk_0206940C.s @@ -101,7 +101,7 @@ _020694AA: ldrb r4, [r0, r5] cmp r4, #0 bne _020694B6 - bl sub_02022974 + bl GF_AssertFail _020694B6: cmp r4, #1 bhi _020694BE @@ -123,7 +123,7 @@ _020694BE: lsr r6, r0, #0x10 cmp r6, r4 blo _020694E6 - bl sub_02022974 + bl GF_AssertFail _020694E6: lsl r1, r5, #1 mov r0, #9 @@ -158,7 +158,7 @@ _02069524: lsl r7, r4, #1 cmp r6, r7 bge _0206952E - bl sub_02022974 + bl GF_AssertFail _0206952E: sub r0, r6, r7 lsl r0, r0, #0x18 @@ -268,7 +268,7 @@ _020695D4: lsr r7, r0, #0x10 cmp r7, #0x64 blo _02069606 - bl sub_02022974 + bl GF_AssertFail _02069606: cmp r7, #0x32 bhs _0206960E @@ -482,7 +482,7 @@ sub_02069774: ; 0x02069774 add r6, r2, #0 cmp r4, #0 bne _02069784 - bl sub_02022974 + bl GF_AssertFail _02069784: str r4, [r5, #8] str r6, [r5, #0xc] @@ -738,7 +738,7 @@ _02069940: add r1, r1, #1 cmp r1, #3 blt _0206992E - bl sub_02022974 + bl GF_AssertFail _0206994A: pop {r4, r5, r6, pc} thumb_func_end sub_020698E4 @@ -828,7 +828,7 @@ _020699D0: lsr r4, r0, #0x10 cmp r4, #0x64 blo _020699E8 - bl sub_02022974 + bl GF_AssertFail _020699E8: ldrb r0, [r6, r5] cmp r4, r0 @@ -986,7 +986,7 @@ _02069B1A: lsl r0, r5, #0x10 lsr r0, r0, #0x10 bne _02069B24 - bl sub_02022974 + bl GF_AssertFail _02069B24: lsl r0, r5, #0x10 lsr r0, r0, #0x10 @@ -1013,7 +1013,7 @@ _02069B30: lsr r0, r0, #0x10 cmp r4, r0 blo _02069B5E - bl sub_02022974 + bl GF_AssertFail _02069B5E: cmp r4, #0 bne _02069B66 diff --git a/asm/unk_0206A8DC.s b/asm/unk_0206A8DC.s index 421b6c8b47..6026ace1e8 100644 --- a/asm/unk_0206A8DC.s +++ b/asm/unk_0206A8DC.s @@ -56,7 +56,7 @@ _0206A918: bl sub_0206A8EC pop {r3, pc} _0206A922: - bl sub_02022974 + bl GF_AssertFail _0206A926: mov r0, #0 pop {r3, pc} @@ -942,7 +942,7 @@ sub_0206AF3C: ; 0x0206AF3C add r6, r1, #0 cmp r4, #0x45 blo _0206AF4C - bl sub_02022974 + bl GF_AssertFail _0206AF4C: mov r2, #0x9b lsl r2, r2, #4 @@ -971,7 +971,7 @@ sub_0206AF6C: ; 0x0206AF6C add r6, r1, #0 cmp r4, #0x14 blt _0206AF7C - bl sub_02022974 + bl GF_AssertFail _0206AF7C: ldr r2, _0206AF8C ; =0x00000997 add r0, r5, #0 diff --git a/asm/unk_0206AFE0.s b/asm/unk_0206AFE0.s index 2dfd6e1f68..7e6859f910 100644 --- a/asm/unk_0206AFE0.s +++ b/asm/unk_0206AFE0.s @@ -20,7 +20,7 @@ sub_0206AFE0: ; 0x0206AFE0 cmp r5, r1 bls _0206B000 _0206AFF8: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _0206B000: @@ -220,7 +220,7 @@ sub_0206B128: ; 0x0206B128 cmp r4, #4 blo _0206B136 _0206B132: - bl sub_02022974 + bl GF_AssertFail _0206B136: ldr r0, _0206B140 ; =0x020EFA7C lsl r1, r4, #1 @@ -282,7 +282,7 @@ sub_0206B194: ; 0x0206B194 cmp r4, #4 blt _0206B1A2 _0206B19E: - bl sub_02022974 + bl GF_AssertFail _0206B1A2: ldr r0, _0206B1AC ; =0x020EFA74 lsl r1, r4, #1 diff --git a/asm/unk_0206B70C.s b/asm/unk_0206B70C.s index 63dc897722..f365418819 100644 --- a/asm/unk_0206B70C.s +++ b/asm/unk_0206B70C.s @@ -195,7 +195,7 @@ sub_0206B878: ; 0x0206B878 bl FS_OpenFile cmp r0, #0 bne _0206B8A4 - bl sub_02022974 + bl GF_AssertFail add sp, #0x70 pop {r3, r4, r5, r6, r7, pc} _0206B8A4: @@ -205,7 +205,7 @@ _0206B8A4: bl FS_ReadFile cmp r0, #0 bge _0206B8B6 - bl sub_02022974 + bl GF_AssertFail _0206B8B6: mov r0, #0xb mov r1, #4 diff --git a/asm/unk_0206C2D0.s b/asm/unk_0206C2D0.s index 25560587b4..bf3d910194 100644 --- a/asm/unk_0206C2D0.s +++ b/asm/unk_0206C2D0.s @@ -43,7 +43,7 @@ _0206C2F6: _0206C318: cmp r1, #0xc8 blt _0206C320 - bl sub_02022974 + bl GF_AssertFail _0206C320: mov r1, #0 _0206C322: diff --git a/asm/unk_0206C33C.s b/asm/unk_0206C33C.s index 0b9c9f0def..ed000ba41a 100644 --- a/asm/unk_0206C33C.s +++ b/asm/unk_0206C33C.s @@ -60,7 +60,7 @@ _0206C382: lsr r6, r0, #0x10 cmp r6, #0x10 blo _0206C39E - bl sub_02022974 + bl GF_AssertFail _0206C39E: cmp r6, #0 bne _0206C3AC @@ -90,7 +90,7 @@ sub_0206C3C8: ; 0x0206C3C8 add r4, r0, #0 cmp r4, #0x1d blo _0206C3D4 - bl sub_02022974 + bl GF_AssertFail _0206C3D4: ldr r0, _0206C3DC ; =0x020EFB44 lsl r1, r4, #2 @@ -191,7 +191,7 @@ _0206C470: mov r5, #0x3c b _0206C47E _0206C476: - bl sub_02022974 + bl GF_AssertFail add sp, #0x1c pop {r4, r5, r6, r7, pc} _0206C47E: @@ -289,7 +289,7 @@ _0206C54C: lsr r5, r0, #0x10 cmp r5, #0x1d blo _0206C562 - bl sub_02022974 + bl GF_AssertFail _0206C562: lsl r0, r5, #0x18 lsr r2, r0, #0x18 @@ -348,7 +348,7 @@ _0206C5CE: ldrh r5, [r4] cmp r5, #0 bne _0206C5D8 - bl sub_02022974 + bl GF_AssertFail _0206C5D8: cmp r5, #1 bhi _0206C5E0 @@ -370,7 +370,7 @@ _0206C5E0: lsr r6, r0, #0x10 cmp r6, r5 blo _0206C608 - bl sub_02022974 + bl GF_AssertFail _0206C608: lsl r0, r6, #0x18 lsr r0, r0, #0x17 diff --git a/asm/unk_0206C784.s b/asm/unk_0206C784.s index 31336a31e1..a678b09d1c 100644 --- a/asm/unk_0206C784.s +++ b/asm/unk_0206C784.s @@ -145,7 +145,7 @@ _0206C8A2: strb r0, [r4] b _0206C8BA _0206C8A8: - bl sub_02022974 + bl GF_AssertFail add r0, r4, #0 bl sub_020181C4 add sp, #0x28 @@ -482,7 +482,7 @@ _0206CB2E: str r0, [r4, #0x24] b _0206CB4A _0206CB40: - bl sub_02022974 + bl GF_AssertFail add sp, #0xc mov r0, #1 pop {r3, r4, pc} @@ -600,7 +600,7 @@ _0206CC06: bl sub_020552B4 cmp r0, #0 bne _0206CC1A - bl sub_02022974 + bl GF_AssertFail _0206CC1A: ldr r0, [sp, #0x20] bl ov5_021E18BC @@ -625,7 +625,7 @@ _0206CC1A: bl ov5_021D41C8 b _0206CC50 _0206CC4C: - bl sub_02022974 + bl GF_AssertFail _0206CC50: add r0, r6, #1 lsl r0, r0, #0x18 @@ -676,7 +676,7 @@ _0206CC8C: str r1, [r0, #8] pop {r3, pc} _0206CCA8: - bl sub_02022974 + bl GF_AssertFail _0206CCAC: pop {r3, pc} ; .align 2, 0 diff --git a/asm/unk_0206CCB0.s b/asm/unk_0206CCB0.s index 17a45bab8d..f108b03251 100644 --- a/asm/unk_0206CCB0.s +++ b/asm/unk_0206CCB0.s @@ -15,7 +15,7 @@ sub_0206CCB0: ; 0x0206CCB0 cmp r5, #6 blt _0206CCC0 _0206CCBC: - bl sub_02022974 + bl GF_AssertFail _0206CCC0: sub r1, r5, #1 ldr r6, _0206CCD8 ; =0x020EFD60 @@ -25,7 +25,7 @@ _0206CCC0: ldr r0, [r6, r4] cmp r0, r5 beq _0206CCD4 - bl sub_02022974 + bl GF_AssertFail _0206CCD4: add r0, r6, r4 pop {r4, r5, r6, pc} @@ -46,7 +46,7 @@ sub_0206CCDC: ; 0x0206CCDC cmp r4, r0 blt _0206CCF6 _0206CCF2: - bl sub_02022974 + bl GF_AssertFail _0206CCF6: sub r0, r4, #1 ldr r1, [r5, #8] @@ -70,7 +70,7 @@ sub_0206CD00: ; 0x0206CD00 ldr r4, [r0, #0] cmp r4, #0 bne _0206CD22 - bl sub_02022974 + bl GF_AssertFail _0206CD22: add r0, r6, #0 add r1, r7, #0 @@ -684,7 +684,7 @@ sub_0206D160: ; 0x0206D160 ldrh r0, [r5, #0x22] cmp r0, #0 bne _0206D1A4 - bl sub_02022974 + bl GF_AssertFail _0206D1A4: add r2, r5, #0 add r5, #0xc @@ -1342,7 +1342,7 @@ sub_0206D644: ; 0x0206D644 lsr r4, r0, #0x10 cmp r4, #5 blo _0206D69C - bl sub_02022974 + bl GF_AssertFail _0206D69C: add r4, #0x11 add r0, r4, #0 @@ -1828,7 +1828,7 @@ sub_0206D9F4: ; 0x0206D9F4 lsr r4, r0, #0x10 cmp r4, #3 blo _0206DA42 - bl sub_02022974 + bl GF_AssertFail _0206DA42: add r4, #0x21 add r0, r4, #0 @@ -1879,7 +1879,7 @@ sub_0206DA84: ; 0x0206DA84 ldr r1, [r4, #0] cmp r1, r0 beq _0206DAA0 - bl sub_02022974 + bl GF_AssertFail _0206DAA0: add r0, r5, #0 mov r1, #0 @@ -2346,7 +2346,7 @@ _0206DDF4: bl sub_02092464 cmp r0, #0xff bls _0206DE06 - bl sub_02022974 + bl GF_AssertFail add sp, #0x2c pop {r4, r5, r6, r7, pc} _0206DE06: @@ -3762,7 +3762,7 @@ sub_0206E870: ; 0x0206E870 add r4, r0, #0 cmp r4, #0 bgt _0206E88E - bl sub_02022974 + bl GF_AssertFail _0206E88E: cmp r4, #1 ble _0206E8A0 @@ -3798,7 +3798,7 @@ _0206E8C0: _0206E8C8: cmp r5, #0 beq _0206E8D0 - bl sub_02022974 + bl GF_AssertFail _0206E8D0: bl sub_0201D2E8 mov r1, #0xf1 @@ -3808,7 +3808,7 @@ _0206E8D0: lsr r4, r0, #0x10 cmp r4, #0x11 blo _0206E8E8 - bl sub_02022974 + bl GF_AssertFail _0206E8E8: cmp r4, #9 blt _0206E8EE @@ -3868,7 +3868,7 @@ sub_0206E940: ; 0x0206E940 lsr r4, r0, #0x10 cmp r4, #5 blo _0206E95C - bl sub_02022974 + bl GF_AssertFail _0206E95C: ldr r0, _0206EA08 ; =0x02100BA4 lsl r1, r4, #1 @@ -3910,7 +3910,7 @@ _0206E9A4: lsr r4, r0, #0x10 cmp r4, #4 blo _0206E9B4 - bl sub_02022974 + bl GF_AssertFail _0206E9B4: cmp r4, #3 bhi _0206E9DC @@ -3962,7 +3962,7 @@ _0206E9F8: mov r0, #0xc pop {r3, r4, r5, r6, r7, pc} _0206E9FC: - bl sub_02022974 + bl GF_AssertFail mov r0, #1 pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -4284,7 +4284,7 @@ _0206EC2E: lsl r0, r4, #0x10 lsr r0, r0, #0x10 bne _0206EC40 - bl sub_02022974 + bl GF_AssertFail _0206EC40: lsl r0, r4, #0x10 lsr r0, r0, #0x10 @@ -4311,7 +4311,7 @@ _0206EC4C: lsr r0, r0, #0x10 cmp r5, r0 blo _0206EC7A - bl sub_02022974 + bl GF_AssertFail _0206EC7A: add r0, sp, #0x10 add r0, #2 @@ -4654,7 +4654,7 @@ _0206EEFC: _0206EF02: cmp r4, #0xb blt _0206EF0A - bl sub_02022974 + bl GF_AssertFail _0206EF0A: ldr r1, [sp, #8] add r0, r6, #0 diff --git a/asm/unk_0207064C.s b/asm/unk_0207064C.s index 02cabeb60f..070bf51899 100644 --- a/asm/unk_0207064C.s +++ b/asm/unk_0207064C.s @@ -81,7 +81,7 @@ _020706BC: lsl r0, r0, #0x10 lsr r6, r0, #0x10 bne _020706E4 - bl sub_02022974 + bl GF_AssertFail _020706E4: add r0, r6, #0 add r1, sp, #8 diff --git a/asm/unk_0207070C.s b/asm/unk_0207070C.s index d409e80fc4..a2094a0e36 100644 --- a/asm/unk_0207070C.s +++ b/asm/unk_0207070C.s @@ -215,7 +215,7 @@ sub_02070890: ; 0x02070890 ldr r0, _020708A8 ; =0x19740205 cmp r1, r0 beq _020708A0 - bl sub_02022974 + bl GF_AssertFail _020708A0: add r0, r4, #0 bl sub_020181C4 diff --git a/asm/unk_020711EC.s b/asm/unk_020711EC.s index 99d9012209..e79cc2f543 100644 --- a/asm/unk_020711EC.s +++ b/asm/unk_020711EC.s @@ -199,7 +199,7 @@ sub_0207136C: ; 0x0207136C push {r4, lr} add r4, r0, #0 bne _02071376 - bl sub_02022974 + bl GF_AssertFail _02071376: add r0, r4, #0 bl sub_020714F0 @@ -283,7 +283,7 @@ sub_02071400: ; 0x02071400 bl sub_0200D9E8 add r4, r0, #0 bne _02071416 - bl sub_02022974 + bl GF_AssertFail _02071416: add r0, r4, #0 pop {r4, pc} @@ -307,7 +307,7 @@ sub_0207142C: ; 0x0207142C bl sub_02018144 add r4, r0, #0 bne _0207143C - bl sub_02022974 + bl GF_AssertFail _0207143C: add r2, r4, #0 mov r1, #0x10 @@ -342,7 +342,7 @@ sub_0207145C: ; 0x0207145C bl sub_02018144 add r4, r0, #0 bne _02071472 - bl sub_02022974 + bl GF_AssertFail _02071472: add r0, r4, #0 mov r1, #0 diff --git a/asm/unk_0207160C.s b/asm/unk_0207160C.s index 9633201a15..34968761ce 100644 --- a/asm/unk_0207160C.s +++ b/asm/unk_0207160C.s @@ -69,7 +69,7 @@ _02071672: bl sub_02055324 cmp r0, #0 bne _02071694 - bl sub_02022974 + bl GF_AssertFail _02071694: ldr r1, [sp, #0x14] add r0, sp, #0x18 @@ -281,7 +281,7 @@ _020717FE: str r1, [r0, #8] pop {r3, r4, r5, pc} _02071808: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} nop _02071810: .word 0x00000123 @@ -442,7 +442,7 @@ _02071932: bl sub_02055324 cmp r0, #0 bne _02071954 - bl sub_02022974 + bl GF_AssertFail _02071954: ldr r1, [sp, #0xc] add r0, sp, #0x10 @@ -567,7 +567,7 @@ _02071A32: bl sub_02055324 cmp r0, #0 bne _02071A54 - bl sub_02022974 + bl GF_AssertFail _02071A54: ldr r1, [sp, #0xc] add r0, sp, #0x10 diff --git a/asm/unk_02071B10.s b/asm/unk_02071B10.s index 914159cea5..a2eea78660 100644 --- a/asm/unk_02071B10.s +++ b/asm/unk_02071B10.s @@ -58,7 +58,7 @@ sub_02071B6C: ; 0x02071B6C add r7, r0, #0 cmp r5, #3 blo _02071B7A - bl sub_02022974 + bl GF_AssertFail _02071B7A: add r0, r7, #0 bl sub_0203D174 @@ -94,7 +94,7 @@ _02071BB6: mov r6, #0x19 b _02071BC2 _02071BBE: - bl sub_02022974 + bl GF_AssertFail _02071BC2: ldr r0, [r7, #0x1c] ldr r0, [r0, #0xc] @@ -201,7 +201,7 @@ sub_02071C80: ; 0x02071C80 add r6, r2, #0 cmp r4, #1 bls _02071C90 - bl sub_02022974 + bl GF_AssertFail _02071C90: mov r0, #0 mvn r0, r0 diff --git a/asm/unk_02073838.s b/asm/unk_02073838.s index 4c90af9824..726b940d25 100644 --- a/asm/unk_02073838.s +++ b/asm/unk_02073838.s @@ -121,7 +121,7 @@ sub_020738EC: ; 0x020738EC bl sub_0200DA04 cmp r0, #0 bne _02073900 - bl sub_02022974 + bl GF_AssertFail _02073900: pop {r3, pc} nop @@ -306,7 +306,7 @@ sub_02073A14: ; 0x02073A14 str r0, [r5, #0x10] cmp r0, #0 bne _02073A3A - bl sub_02022974 + bl GF_AssertFail _02073A3A: pop {r3, r4, r5, pc} thumb_func_end sub_02073A14 @@ -469,7 +469,7 @@ sub_02073B28: ; 0x02073B28 ldr r0, [r4, #0x10] cmp r0, #0 bne _02073B36 - bl sub_02022974 + bl GF_AssertFail _02073B36: ldr r0, [r4, #0x10] ldr r0, [r0, #8] diff --git a/asm/unk_02073C2C.s b/asm/unk_02073C2C.s index e3bbc985b1..15894668ab 100644 --- a/asm/unk_02073C2C.s +++ b/asm/unk_02073C2C.s @@ -74,7 +74,7 @@ sub_02073C88: ; 0x02073C88 mov r4, #1 lsr r0, r0, #0x1f beq _02073CA2 - bl sub_02022974 + bl GF_AssertFail _02073CA2: ldrh r1, [r5, #4] mov r0, #1 @@ -1046,7 +1046,7 @@ sub_02074470: ; 0x02074470 beq _020744B8 cmp r0, r1 beq _020744B0 - bl sub_02022974 + bl GF_AssertFail _020744B0: ldrh r1, [r5, #4] mov r0, #4 @@ -1184,7 +1184,7 @@ sub_02074570: ; 0x02074570 beq _020745AC cmp r0, r1 beq _020745A4 - bl sub_02022974 + bl GF_AssertFail _020745A4: ldrh r1, [r5, #4] mov r0, #4 @@ -2000,7 +2000,7 @@ sub_02074B30: ; 0x02074B30 beq _02074B86 cmp r0, r1 beq _02074B70 - bl sub_02022974 + bl GF_AssertFail _02074B70: ldrh r1, [r5, #4] mov r0, #4 @@ -2160,7 +2160,7 @@ sub_02074C60: ; 0x02074C60 beq _02074CAA cmp r0, r1 beq _02074C94 - bl sub_02022974 + bl GF_AssertFail _02074C94: ldrh r1, [r5, #4] mov r0, #4 @@ -2425,7 +2425,7 @@ _02074E94: str r1, [r0, #0] pop {r3, r4, r5, r6, r7, pc} _02074E9E: - bl sub_02022974 + bl GF_AssertFail ldr r0, [sp] ldrb r1, [r4] ldrh r2, [r0, #4] @@ -2440,7 +2440,7 @@ _02074E9E: strh r1, [r0, #4] pop {r3, r4, r5, r6, r7, pc} _02074EBC: - bl sub_02022974 + bl GF_AssertFail ldr r0, [sp] ldrh r1, [r0, #4] mov r0, #2 @@ -3125,7 +3125,7 @@ sub_0207536C: ; 0x0207536C beq _020753BA cmp r0, r1 beq _020753AC - bl sub_02022974 + bl GF_AssertFail _020753AC: ldrh r2, [r5, #6] add r0, r5, #0 @@ -3209,7 +3209,7 @@ _02075438: strh r1, [r0] pop {r3, pc} _02075446: - bl sub_02022974 + bl GF_AssertFail pop {r3, pc} _0207544C: bl sub_02075454 @@ -3766,7 +3766,7 @@ _02075848: str r0, [r5, #0x10] pop {r4, r5, r6, r7, pc} _02075856: - bl sub_02022974 + bl GF_AssertFail _0207585A: add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -3819,7 +3819,7 @@ sub_020758B0: ; 0x020758B0 add r6, r1, #0 cmp r4, #0 bne _020758BE - bl sub_02022974 + bl GF_AssertFail _020758BE: cmp r6, #0x20 bhi _020759B2 @@ -3988,7 +3988,7 @@ sub_020759B8: ; 0x020759B8 push {r4, lr} add r4, r0, #0 bne _020759C2 - bl sub_02022974 + bl GF_AssertFail _020759C2: add r0, r4, #0 bl sub_020181C4 @@ -4147,7 +4147,7 @@ sub_02075AE4: ; 0x02075AE4 add r4, r1, #0 cmp r5, #8 blt _02075AF2 - bl sub_02022974 + bl GF_AssertFail _02075AF2: add r0, r4, #0 mov r1, #3 @@ -4164,11 +4164,11 @@ sub_02075B00: ; 0x02075B00 add r5, r1, #0 cmp r6, #8 blt _02075B0E - bl sub_02022974 + bl GF_AssertFail _02075B0E: cmp r5, #0x65 ble _02075B16 - bl sub_02022974 + bl GF_AssertFail _02075B16: mov r1, #0x65 mov r0, #0 @@ -7054,7 +7054,7 @@ sub_02076F84: ; 0x02076F84 ldr r0, _02076FCC ; =0x000001EE cmp r4, r0 blo _02076F9A - bl sub_02022974 + bl GF_AssertFail _02076F9A: add r0, sp, #4 bl FS_InitFile @@ -8604,7 +8604,7 @@ sub_02077ADC: ; 0x02077ADC ldr r0, [sp, #0xc] cmp r0, #1 ble _02077AFC - bl sub_02022974 + bl GF_AssertFail _02077AFC: add r0, r4, #0 mov r1, #0x70 @@ -10463,7 +10463,7 @@ sub_020787CC: ; 0x020787CC mov r4, #1 cmp r5, #0x20 blt _020787DA - bl sub_02022974 + bl GF_AssertFail _020787DA: mov r0, #0 cmp r5, #0 diff --git a/asm/unk_020797C8.s b/asm/unk_020797C8.s index a043ee687e..1b29e5aed0 100644 --- a/asm/unk_020797C8.s +++ b/asm/unk_020797C8.s @@ -230,7 +230,7 @@ _02079950: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _02079960: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} thumb_func_end sub_02079914 @@ -260,7 +260,7 @@ _02079974: bl sub_02024804 pop {r3, pc} _02079996: - bl sub_02022974 + bl GF_AssertFail pop {r3, pc} thumb_func_end sub_02079968 @@ -423,7 +423,7 @@ sub_02079A94: ; 0x02079A94 bl sub_02024804 pop {r3, pc} _02079AA2: - bl sub_02022974 + bl GF_AssertFail pop {r3, pc} thumb_func_end sub_02079A94 @@ -437,7 +437,7 @@ sub_02079AA8: ; 0x02079AA8 ldrb r0, [r1, r0] pop {r3, pc} _02079AB6: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, pc} nop @@ -467,7 +467,7 @@ _02079ADE: bl sub_02024804 pop {r3, pc} _02079AEA: - bl sub_02022974 + bl GF_AssertFail pop {r3, pc} ; .align 2, 0 _02079AF0: .word 0x000121B4 @@ -494,7 +494,7 @@ _02079B02: bl sub_02023D28 pop {r3, pc} _02079B18: - bl sub_02022974 + bl GF_AssertFail pop {r3, pc} nop _02079B20: .word 0x00011EE4 @@ -562,7 +562,7 @@ _02079B84: add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} _02079B90: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} thumb_func_end sub_02079B54 @@ -608,7 +608,7 @@ _02079BD6: add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} _02079BE2: - bl sub_02022974 + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} ; .align 2, 0 @@ -645,11 +645,11 @@ sub_02079C08: ; 0x02079C08 mvn r0, r0 cmp r4, r0 beq _02079C22 - bl sub_02022974 + bl GF_AssertFail _02079C22: cmp r6, #0x1e blo _02079C2A - bl sub_02022974 + bl GF_AssertFail _02079C2A: mov r0, #0 mvn r0, r0 @@ -685,11 +685,11 @@ sub_02079C50: ; 0x02079C50 mvn r0, r0 cmp r4, r0 beq _02079C6A - bl sub_02022974 + bl GF_AssertFail _02079C6A: cmp r6, #0x1e blo _02079C72 - bl sub_02022974 + bl GF_AssertFail _02079C72: mov r0, #0 mvn r0, r0 @@ -725,11 +725,11 @@ sub_02079C9C: ; 0x02079C9C mvn r0, r0 cmp r4, r0 beq _02079CB4 - bl sub_02022974 + bl GF_AssertFail _02079CB4: cmp r6, #0x1e blo _02079CBC - bl sub_02022974 + bl GF_AssertFail _02079CBC: mov r0, #0 mvn r0, r0 @@ -755,7 +755,7 @@ sub_02079CD8: ; 0x02079CD8 add r5, r0, #0 cmp r4, #8 blo _02079CE6 - bl sub_02022974 + bl GF_AssertFail _02079CE6: ldr r0, _02079CF8 ; =0x000121C6 mov r1, #1 @@ -776,7 +776,7 @@ sub_02079CFC: ; 0x02079CFC add r5, r0, #0 cmp r4, #8 blo _02079D0A - bl sub_02022974 + bl GF_AssertFail _02079D0A: ldr r0, _02079D1C ; =0x000121C6 ldrb r2, [r5, r0] diff --git a/asm/unk_02079FEC.s b/asm/unk_02079FEC.s index 53476a88fa..ac8ba9f9f3 100644 --- a/asm/unk_02079FEC.s +++ b/asm/unk_02079FEC.s @@ -42,7 +42,7 @@ sub_0207A014: ; 0x0207A014 add r5, r0, #0 cmp r6, #6 ble _0207A022 - bl sub_02022974 + bl GF_AssertFail _0207A022: mov r2, #0x59 add r0, r5, #0 @@ -104,22 +104,22 @@ sub_0207A080: ; 0x0207A080 add r7, r0, #0 add r4, r1, #0 bpl _0207A08C - bl sub_02022974 + bl GF_AssertFail _0207A08C: ldr r0, [r7, #4] cmp r4, r0 blt _0207A096 - bl sub_02022974 + bl GF_AssertFail _0207A096: ldr r0, [r7, #0] cmp r4, r0 blt _0207A0A0 - bl sub_02022974 + bl GF_AssertFail _0207A0A0: ldr r0, [r7, #4] cmp r0, #0 bgt _0207A0AA - bl sub_02022974 + bl GF_AssertFail _0207A0AA: ldr r0, [r7, #4] sub r0, r0, #1 @@ -180,17 +180,17 @@ sub_0207A0FC: ; 0x0207A0FC add r5, r0, #0 add r4, r1, #0 bpl _0207A108 - bl sub_02022974 + bl GF_AssertFail _0207A108: ldr r0, [r5, #4] cmp r4, r0 blt _0207A112 - bl sub_02022974 + bl GF_AssertFail _0207A112: ldr r0, [r5, #0] cmp r4, r0 blt _0207A11C - bl sub_02022974 + bl GF_AssertFail _0207A11C: mov r0, #0xec add r5, #8 @@ -208,17 +208,17 @@ sub_0207A128: ; 0x0207A128 add r6, r2, #0 cmp r4, #0 bge _0207A138 - bl sub_02022974 + bl GF_AssertFail _0207A138: ldr r0, [r5, #4] cmp r4, r0 blt _0207A142 - bl sub_02022974 + bl GF_AssertFail _0207A142: ldr r0, [r5, #0] cmp r4, r0 blt _0207A14C - bl sub_02022974 + bl GF_AssertFail _0207A14C: add r1, r5, #0 mov r0, #0xec @@ -257,31 +257,31 @@ sub_0207A184: ; 0x0207A184 add r6, r2, #0 cmp r5, #0 bge _0207A194 - bl sub_02022974 + bl GF_AssertFail _0207A194: ldr r0, [r4, #4] cmp r5, r0 blt _0207A19E - bl sub_02022974 + bl GF_AssertFail _0207A19E: ldr r0, [r4, #0] cmp r5, r0 blt _0207A1A8 - bl sub_02022974 + bl GF_AssertFail _0207A1A8: cmp r6, #0 bge _0207A1B0 - bl sub_02022974 + bl GF_AssertFail _0207A1B0: ldr r0, [r4, #4] cmp r6, r0 blt _0207A1BA - bl sub_02022974 + bl GF_AssertFail _0207A1BA: ldr r0, [r4, #0] cmp r6, r0 blt _0207A1C4 - bl sub_02022974 + bl GF_AssertFail _0207A1C4: mov r0, #0 mov r1, #0xec diff --git a/asm/unk_0207AE68.s b/asm/unk_0207AE68.s index 1fd68b181f..3ed8f48f6a 100644 --- a/asm/unk_0207AE68.s +++ b/asm/unk_0207AE68.s @@ -765,7 +765,7 @@ _0207B4A8: lsl r1, r1, #0xe cmp r0, r1 bhi _0207B4F0 - bl sub_02022974 + bl GF_AssertFail _0207B4F0: ldr r0, _0207B598 ; =0x000005F9 bl sub_02005748 diff --git a/asm/unk_0207C63C.s b/asm/unk_0207C63C.s index ffe36d7bfa..6703764c07 100644 --- a/asm/unk_0207C63C.s +++ b/asm/unk_0207C63C.s @@ -149,11 +149,11 @@ sub_0207C730: ; 0x0207C730 add r5, r0, #0 cmp r4, #0 bne _0207C758 - bl sub_02022974 + bl GF_AssertFail _0207C758: cmp r5, #0 bne _0207C760 - bl sub_02022974 + bl GF_AssertFail _0207C760: bl sub_02014000 pop {r3, r4, r5, pc} @@ -325,7 +325,7 @@ sub_0207C894: ; 0x0207C894 bl sub_02018144 add r4, r0, #0 bne _0207C8A8 - bl sub_02022974 + bl GF_AssertFail _0207C8A8: ldr r0, [r5, #0] ldr r2, [r5, #4] diff --git a/asm/unk_0207C908.s b/asm/unk_0207C908.s index 3e3dde337c..e05f93ec96 100644 --- a/asm/unk_0207C908.s +++ b/asm/unk_0207C908.s @@ -12,7 +12,7 @@ sub_0207C908: ; 0x0207C908 add r4, r0, #0 cmp r4, #0x17 blo _0207C914 - bl sub_02022974 + bl GF_AssertFail _0207C914: ldr r0, _0207C91C ; =0x020F0AF0 lsl r1, r4, #2 @@ -46,7 +46,7 @@ sub_0207C92C: ; 0x0207C92C add r4, r0, #0 cmp r4, #0x17 blo _0207C938 - bl sub_02022974 + bl GF_AssertFail _0207C938: ldr r0, _0207C940 ; =0x020F0B4C ldrb r0, [r0, r4] @@ -249,7 +249,7 @@ sub_0207CA90: ; 0x0207CA90 add r4, r0, #0 cmp r4, #3 blo _0207CA9C - bl sub_02022974 + bl GF_AssertFail _0207CA9C: ldr r0, _0207CAA4 ; =0x020F0AE4 lsl r1, r4, #2 @@ -265,7 +265,7 @@ sub_0207CAA8: ; 0x0207CAA8 add r4, r0, #0 cmp r4, #3 blo _0207CAB4 - bl sub_02022974 + bl GF_AssertFail _0207CAB4: ldr r0, _0207CABC ; =0x020F0AE0 ldrb r0, [r0, r4] diff --git a/asm/unk_0207E060.s b/asm/unk_0207E060.s index ecd67cf281..5519c493bc 100644 --- a/asm/unk_0207E060.s +++ b/asm/unk_0207E060.s @@ -36,7 +36,7 @@ sub_0207E060: ; 0x0207E060 bl ov4_021D222C cmp r0, #1 beq _0207E0AA - bl sub_02022974 + bl GF_AssertFail _0207E0AA: add r0, r4, #0 pop {r3, r4, r5, pc} diff --git a/asm/unk_0208694C.s b/asm/unk_0208694C.s index 3b308ebe57..3e43e1d9ac 100644 --- a/asm/unk_0208694C.s +++ b/asm/unk_0208694C.s @@ -974,11 +974,11 @@ sub_0208716C: ; 0x0208716C ldr r0, [r4, #0x18] cmp r0, #0 bne _0208717A - bl sub_02022974 + bl GF_AssertFail _0208717A: cmp r4, #0 bne _02087182 - bl sub_02022974 + bl GF_AssertFail _02087182: ldr r0, [r4, #0x18] bl sub_020237BC diff --git a/asm/unk_020890F4.s b/asm/unk_020890F4.s index 61e3b1508a..c64fc15604 100644 --- a/asm/unk_020890F4.s +++ b/asm/unk_020890F4.s @@ -390,11 +390,11 @@ sub_02089438: ; 0x02089438 ldr r0, [r4, #0x1c] cmp r0, #0 bne _02089446 - bl sub_02022974 + bl GF_AssertFail _02089446: cmp r4, #0 bne _0208944E - bl sub_02022974 + bl GF_AssertFail _0208944E: ldr r0, [r4, #0x1c] bl sub_020237BC diff --git a/asm/unk_0208A3F4.s b/asm/unk_0208A3F4.s index b96178f62e..48751ccd65 100644 --- a/asm/unk_0208A3F4.s +++ b/asm/unk_0208A3F4.s @@ -60,7 +60,7 @@ sub_0208A3F4: ; 0x0208A3F4 bl sub_0200C7C0 cmp r0, #0 bne _0208A468 - bl sub_02022974 + bl GF_AssertFail _0208A468: mov r1, #0x2f lsl r1, r1, #4 @@ -71,7 +71,7 @@ _0208A468: bl sub_0200CB30 cmp r0, #0 bne _0208A480 - bl sub_02022974 + bl GF_AssertFail _0208A480: add sp, #0x4c pop {r4, r5, r6, r7, pc} diff --git a/asm/unk_0208C010.s b/asm/unk_0208C010.s index 8e65bc7ace..439d9532da 100644 --- a/asm/unk_0208C010.s +++ b/asm/unk_0208C010.s @@ -12,7 +12,7 @@ sub_0208C010: ; 0x0208C010 cmp r0, #7 blt _0208C022 blt _0208C01C - bl sub_02022974 + bl GF_AssertFail _0208C01C: ldr r0, _0208C02C ; =0x020F3EF0 ldr r0, [r0, #0x64] diff --git a/asm/unk_020933F8.s b/asm/unk_020933F8.s index d0077322e1..8bcf7f9b04 100644 --- a/asm/unk_020933F8.s +++ b/asm/unk_020933F8.s @@ -240,7 +240,7 @@ _020935AC: str r0, [r4, #4] b _020935C8 _020935BA: - bl sub_02022974 + bl GF_AssertFail _020935BE: add r0, r4, #0 bl sub_020181C4 @@ -491,7 +491,7 @@ _02093782: str r0, [r4, #4] b _020937A0 _02093790: - bl sub_02022974 + bl GF_AssertFail _02093794: add r0, r4, #0 bl sub_020181C4 @@ -1009,7 +1009,7 @@ _02093B92: add r6, r0, #0 b _02093BA6 _02093BA2: - bl sub_02022974 + bl GF_AssertFail _02093BA6: cmp r6, #0 beq _02093BB6 @@ -2101,7 +2101,7 @@ _020943D8: bl sub_02032EE8 add r7, r0, #0 bne _020943E6 - bl sub_02022974 + bl GF_AssertFail _020943E6: add r0, r7, #0 bl sub_02025FF0 @@ -2128,7 +2128,7 @@ _0209440A: bl sub_02032EE8 add r7, r0, #0 bne _02094418 - bl sub_02022974 + bl GF_AssertFail _02094418: add r0, r7, #0 bl sub_02026004 @@ -2247,7 +2247,7 @@ sub_020944E8: ; 0x020944E8 ldr r0, [r4, r0] cmp r0, #0 beq _020944FA - bl sub_02022974 + bl GF_AssertFail _020944FA: ldr r0, _02094514 ; =0x00000176 mov r1, #0 @@ -2829,7 +2829,7 @@ _020948DC: add r0, #0x31 b _020948EA _020948E4: - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} _020948EA: lsl r0, r0, #0x18 @@ -3028,7 +3028,7 @@ _02094A26: _02094A28: cmp r4, #0x64 bne _02094A30 - bl sub_02022974 + bl GF_AssertFail _02094A30: ldr r0, _02094A54 ; =0x0000198C ldr r0, [r5, r0] @@ -3058,7 +3058,7 @@ sub_02094A58: ; 0x02094A58 ldr r0, [r5, r0] cmp r0, #0 beq _02094A6A - bl sub_02022974 + bl GF_AssertFail _02094A6A: mov r0, #4 mov r1, #0x10 diff --git a/asm/unk_02094EDC.s b/asm/unk_02094EDC.s index 1ca7a40ecc..4af5368757 100644 --- a/asm/unk_02094EDC.s +++ b/asm/unk_02094EDC.s @@ -212,7 +212,7 @@ _02095046: ldr r0, [sp, #8] cmp r6, r0 bge _02095050 - bl sub_02022974 + bl GF_AssertFail _02095050: mov r0, #0 str r0, [sp, #0x10] @@ -370,7 +370,7 @@ _02095164: _0209516E: cmp r6, #4 bhs _02095176 - bl sub_02022974 + bl GF_AssertFail _02095176: mov r6, #0 mov r7, #0x30 @@ -535,7 +535,7 @@ _02095286: ldrb r2, [r0] b _02095294 _0209528E: - bl sub_02022974 + bl GF_AssertFail mov r2, #0 _02095294: mov r0, #0x54 @@ -796,7 +796,7 @@ sub_02095484: ; 0x02095484 ldr r0, [r4, #0] cmp r0, #0 bne _020954B8 - bl sub_02022974 + bl GF_AssertFail _020954B8: add r1, sp, #0x14 ldrh r0, [r1] @@ -1000,7 +1000,7 @@ _0209562A: strb r1, [r0, r4] cmp r5, #2 bhs _0209563A - bl sub_02022974 + bl GF_AssertFail _0209563A: ldr r2, [sp, #4] mov r3, #0 @@ -1032,7 +1032,7 @@ _0209563E: blt _0209563E cmp r4, #1 bhs _02095678 - bl sub_02022974 + bl GF_AssertFail _02095678: ldr r0, [sp, #4] bl sub_02094E98 @@ -1131,7 +1131,7 @@ sub_02095734: ; 0x02095734 add r4, r0, #0 cmp r4, #0x18 blo _02095740 - bl sub_02022974 + bl GF_AssertFail _02095740: mov r0, #0x1a add r1, r4, #0 @@ -1151,7 +1151,7 @@ sub_02095750: ; 0x02095750 add r6, r2, #0 cmp r5, #0x18 blo _02095760 - bl sub_02022974 + bl GF_AssertFail _02095760: mov r0, #0x1a add r1, r5, #0 @@ -1174,7 +1174,7 @@ sub_0209577C: ; 0x0209577C add r4, r0, #0 cmp r4, #0x18 blo _02095788 - bl sub_02022974 + bl GF_AssertFail _02095788: add r4, #0x2d add r0, r4, #0 @@ -1191,7 +1191,7 @@ sub_02095790: ; 0x02095790 add r6, r3, #0 cmp r4, #0x18 blo _020957A2 - bl sub_02022974 + bl GF_AssertFail _020957A2: cmp r7, #4 bhi _020957BC @@ -1624,7 +1624,7 @@ _02095A68: add r0, #0x8b pop {r3, pc} _02095A6C: - bl sub_02022974 + bl GF_AssertFail mov r0, #0x7b pop {r3, pc} thumb_func_end sub_02095A3C diff --git a/asm/unk_02095AF0.s b/asm/unk_02095AF0.s index a0cc38c637..c4e12c9ac2 100644 --- a/asm/unk_02095AF0.s +++ b/asm/unk_02095AF0.s @@ -27,7 +27,7 @@ sub_02095B04: ; 0x02095B04 add r4, r1, #0 cmp r2, r0 blt _02095B16 - bl sub_02022974 + bl GF_AssertFail _02095B16: ldr r0, _02095B20 ; =0x00000985 add r1, r4, r0 @@ -125,7 +125,7 @@ sub_02095B9C: ; 0x02095B9C lsl r0, r0, #0xa cmp r1, r0 blt _02095BB8 - bl sub_02022974 + bl GF_AssertFail _02095BB8: mov r7, #0 ldr r4, [sp, #4] @@ -169,7 +169,7 @@ sub_02095BEC: ; 0x02095BEC str r0, [sp] cmp r0, r1 blt _02095C0A - bl sub_02022974 + bl GF_AssertFail _02095C0A: ldr r0, _02095C44 ; =0x00000585 mov r7, #0 diff --git a/asm/unk_02095E98.s b/asm/unk_02095E98.s index 892a7ec476..e62fda069b 100644 --- a/asm/unk_02095E98.s +++ b/asm/unk_02095E98.s @@ -373,7 +373,7 @@ sub_0209612C: ; 0x0209612C bl sub_0203608C cmp r0, #0 beq _0209613E - bl sub_02022974 + bl GF_AssertFail _0209613E: bl sub_0203608C cmp r0, #0 diff --git a/asm/unk_02097B18.s b/asm/unk_02097B18.s index f277b86ae7..095c2567f0 100644 --- a/asm/unk_02097B18.s +++ b/asm/unk_02097B18.s @@ -445,7 +445,7 @@ sub_02097F00: ; 0x02097F00 ldr r0, [r4, #0] cmp r0, r1 bge _02097F10 - bl sub_02022974 + bl GF_AssertFail mov r1, #0 _02097F10: lsl r0, r1, #2 @@ -576,7 +576,7 @@ _02097FDC: beq _02097FEE cmp r0, #1 beq _02097FF4 - bl sub_02022974 + bl GF_AssertFail _02097FEE: mov r0, #5 str r0, [r6, #0x14] @@ -740,7 +740,7 @@ sub_02098140: ; 0x02098140 ldr r0, _0209815C ; =0x0000032A cmp r4, r0 blo _0209814E - bl sub_02022974 + bl GF_AssertFail _0209814E: mov r0, #0xa add r1, r4, #0 @@ -760,7 +760,7 @@ sub_02098164: ; 0x02098164 ldr r0, _02098180 ; =0x0000032A cmp r4, r0 blo _02098172 - bl sub_02022974 + bl GF_AssertFail _02098172: mov r0, #0xa add r1, r4, #0 @@ -780,7 +780,7 @@ sub_02098188: ; 0x02098188 ldr r0, _020981A4 ; =0x0000032A cmp r4, r0 blo _02098196 - bl sub_02022974 + bl GF_AssertFail _02098196: mov r0, #0xa add r1, r4, #0 @@ -800,7 +800,7 @@ sub_020981AC: ; 0x020981AC ldr r0, _020981C8 ; =0x0000032A cmp r4, r0 blo _020981BA - bl sub_02022974 + bl GF_AssertFail _020981BA: mov r0, #0xa add r1, r4, #0 @@ -820,7 +820,7 @@ sub_020981D0: ; 0x020981D0 ldr r0, _020981EC ; =0x0000032A cmp r4, r0 blo _020981DE - bl sub_02022974 + bl GF_AssertFail _020981DE: mov r0, #0xa add r1, r4, #0 @@ -840,7 +840,7 @@ sub_020981F4: ; 0x020981F4 ldr r0, _02098210 ; =0x0000032A cmp r4, r0 blo _02098202 - bl sub_02022974 + bl GF_AssertFail _02098202: mov r0, #0xa add r1, r4, #0 diff --git a/asm/unk_020986CC.s b/asm/unk_020986CC.s index 23b3be19d3..9dea2d02bd 100644 --- a/asm/unk_020986CC.s +++ b/asm/unk_020986CC.s @@ -31,7 +31,7 @@ sub_020986E8: ; 0x020986E8 add r4, r0, #0 cmp r4, #6 blt _020986F4 - bl sub_02022974 + bl GF_AssertFail _020986F4: ldr r0, _020986FC ; =0x020F681C ldrb r0, [r0, r4] diff --git a/asm/unk_02098700.s b/asm/unk_02098700.s index 129e075091..907d49fb86 100644 --- a/asm/unk_02098700.s +++ b/asm/unk_02098700.s @@ -27,7 +27,7 @@ sub_02098718: ; 0x02098718 push {r4, lr} add r4, r0, #0 bne _02098722 - bl sub_02022974 + bl GF_AssertFail _02098722: add r0, r4, #0 bl sub_020181C4 @@ -43,17 +43,17 @@ sub_0209872C: ; 0x0209872C add r4, r2, #0 cmp r5, #0 bne _0209873C - bl sub_02022974 + bl GF_AssertFail _0209873C: ldr r0, [r5, #0] cmp r0, #0 beq _02098746 - bl sub_02022974 + bl GF_AssertFail _02098746: ldr r0, [r5, #4] cmp r0, #0 beq _02098750 - bl sub_02022974 + bl GF_AssertFail _02098750: bl sub_020989B8 add r1, r4, #0 @@ -111,12 +111,12 @@ sub_020987BC: ; 0x020987BC ldr r0, [r4, #0] cmp r0, #0 bne _020987CA - bl sub_02022974 + bl GF_AssertFail _020987CA: ldr r0, [r4, #4] cmp r0, #0 bne _020987D4 - bl sub_02022974 + bl GF_AssertFail _020987D4: ldr r0, [r4, #0] bl sub_020181C4 @@ -147,12 +147,12 @@ sub_02098808: ; 0x02098808 add r4, r1, #0 cmp r5, #0 bne _02098816 - bl sub_02022974 + bl GF_AssertFail _02098816: ldr r0, [r5, #0] cmp r0, #0 bne _02098820 - bl sub_02022974 + bl GF_AssertFail _02098820: ldr r1, [r5, #0] lsl r0, r4, #2 @@ -167,12 +167,12 @@ sub_02098828: ; 0x02098828 add r4, r1, #0 cmp r5, #0 bne _02098836 - bl sub_02022974 + bl GF_AssertFail _02098836: ldr r0, [r5, #4] cmp r0, #0 bne _02098840 - bl sub_02022974 + bl GF_AssertFail _02098840: ldr r1, [r5, #4] lsl r0, r4, #2 @@ -187,12 +187,12 @@ sub_02098848: ; 0x02098848 add r4, r1, #0 cmp r5, #0 bne _02098856 - bl sub_02022974 + bl GF_AssertFail _02098856: ldr r0, [r5, #8] cmp r0, #0 bne _02098860 - bl sub_02022974 + bl GF_AssertFail _02098860: ldr r1, [r5, #8] lsl r0, r4, #1 @@ -207,12 +207,12 @@ sub_02098868: ; 0x02098868 add r4, r1, #0 cmp r5, #0 bne _02098876 - bl sub_02022974 + bl GF_AssertFail _02098876: ldr r0, [r5, #0xc] cmp r0, #0 bne _02098880 - bl sub_02022974 + bl GF_AssertFail _02098880: ldr r1, [r5, #0xc] lsl r0, r4, #1 @@ -227,12 +227,12 @@ sub_02098888: ; 0x02098888 add r4, r1, #0 cmp r5, #0 bne _02098896 - bl sub_02022974 + bl GF_AssertFail _02098896: ldr r0, [r5, #0x10] cmp r0, #0 bne _020988A0 - bl sub_02022974 + bl GF_AssertFail _020988A0: ldr r1, [r5, #0x10] lsl r0, r4, #1 @@ -247,12 +247,12 @@ sub_020988A8: ; 0x020988A8 add r4, r1, #0 cmp r5, #0 bne _020988B6 - bl sub_02022974 + bl GF_AssertFail _020988B6: ldr r0, [r5, #0x14] cmp r0, #0 bne _020988C0 - bl sub_02022974 + bl GF_AssertFail _020988C0: ldr r1, [r5, #0x14] lsl r0, r4, #1 diff --git a/asm/unk_02098FFC.s b/asm/unk_02098FFC.s index 7bf99d4ec9..19ec30f20a 100644 --- a/asm/unk_02098FFC.s +++ b/asm/unk_02098FFC.s @@ -211,7 +211,7 @@ sub_0209916C: ; 0x0209916C str r0, [sp, #0x3c] cmp r0, #0 bge _02099190 - bl sub_02022974 + bl GF_AssertFail add sp, #0x70 mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -406,7 +406,7 @@ _020992EE: bl sub_02021E90 b _02099332 _0209932E: - bl sub_02022974 + bl GF_AssertFail _02099332: ldr r0, [sp, #0x38] str r4, [r0, #4] @@ -504,7 +504,7 @@ sub_020993A8: ; 0x020993A8 ldr r0, [r0, #0] cmp r0, #0 bne _020993EA - bl sub_02022974 + bl GF_AssertFail _020993EA: ldr r0, [r5, #4] cmp r0, #0 @@ -555,7 +555,7 @@ _0209941A: ldr r0, [r0, #0] cmp r0, #0 bne _0209944E - bl sub_02022974 + bl GF_AssertFail _0209944E: add r4, r4, #1 add r6, r6, #4 @@ -593,7 +593,7 @@ _02099466: ldr r0, [r0, r4] cmp r0, #0 bne _0209949A - bl sub_02022974 + bl GF_AssertFail _0209949A: ldr r0, [r6, #0] ldr r0, [r0, r4] diff --git a/asm/unk_020996D0.s b/asm/unk_020996D0.s index 7424a9e18c..087d844467 100644 --- a/asm/unk_020996D0.s +++ b/asm/unk_020996D0.s @@ -74,7 +74,7 @@ sub_0209972C: ; 0x0209972C add r4, r0, #0 cmp r4, #0x13 blo _02099738 - bl sub_02022974 + bl GF_AssertFail _02099738: mov r0, #0xc add r1, r4, #0 @@ -92,7 +92,7 @@ sub_02099748: ; 0x02099748 add r4, r0, #0 cmp r4, #0x13 blo _02099754 - bl sub_02022974 + bl GF_AssertFail _02099754: mov r0, #0xc add r1, r4, #0 @@ -110,7 +110,7 @@ sub_02099764: ; 0x02099764 add r4, r0, #0 cmp r4, #0x13 blo _02099770 - bl sub_02022974 + bl GF_AssertFail _02099770: mov r0, #0xc add r1, r4, #0 @@ -128,7 +128,7 @@ sub_02099780: ; 0x02099780 add r4, r0, #0 cmp r4, #0x13 blo _0209978C - bl sub_02022974 + bl GF_AssertFail _0209978C: mov r0, #0xc add r1, r4, #0 @@ -146,7 +146,7 @@ sub_0209979C: ; 0x0209979C add r4, r0, #0 cmp r4, #0x13 blo _020997A8 - bl sub_02022974 + bl GF_AssertFail _020997A8: mov r0, #0xc add r1, r4, #0 diff --git a/asm/unk_02099D44.s b/asm/unk_02099D44.s index 85fcb43ba0..8071f469d8 100644 --- a/asm/unk_02099D44.s +++ b/asm/unk_02099D44.s @@ -32,7 +32,7 @@ sub_02099D54: ; 0x02099D54 str r4, [r0, #0] pop {r4, pc} _02099D6E: - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} ; .align 2, 0 _02099D74: .word 0x021C0A34 @@ -55,7 +55,7 @@ sub_02099D7C: ; 0x02099D7C mov r0, #1 pop {r3, pc} _02099D98: - bl sub_02022974 + bl GF_AssertFail _02099D9C: mov r0, #0 pop {r3, pc} @@ -79,7 +79,7 @@ sub_02099DA8: ; 0x02099DA8 str r4, [r0, #0] pop {r4, pc} _02099DC2: - bl sub_02022974 + bl GF_AssertFail pop {r4, pc} ; .align 2, 0 _02099DC8: .word 0x021C0A34 @@ -102,7 +102,7 @@ sub_02099DD0: ; 0x02099DD0 mov r0, #1 pop {r3, pc} _02099DEC: - bl sub_02022974 + bl GF_AssertFail _02099DF0: mov r0, #0 pop {r3, pc} diff --git a/asm/unk_0209B6F8.s b/asm/unk_0209B6F8.s index b56ddf5e5b..5185764ccf 100644 --- a/asm/unk_0209B6F8.s +++ b/asm/unk_0209B6F8.s @@ -28,7 +28,7 @@ sub_0209B6F8: ; 0x0209B6F8 str r0, [r4, #0] cmp r0, #0 bne _0209B730 - bl sub_02022974 + bl GF_AssertFail _0209B730: ldr r2, [r4, #0] add r0, r4, #0 @@ -360,7 +360,7 @@ sub_0209B988: ; 0x0209B988 add r6, r3, #0 cmp r0, #0 beq _0209B99C - bl sub_02022974 + bl GF_AssertFail _0209B99C: add r0, r7, #0 add r1, r4, #0 diff --git a/asm/unk_0209BDF8.s b/asm/unk_0209BDF8.s index 5bdc37b547..d5df19bf5c 100644 --- a/asm/unk_0209BDF8.s +++ b/asm/unk_0209BDF8.s @@ -16,7 +16,7 @@ sub_0209BDF8: ; 0x0209BDF8 bl sub_02018144 add r4, r0, #0 bne _0209BE0E - bl sub_02022974 + bl GF_AssertFail _0209BE0E: add r0, r4, #0 mov r1, #0 @@ -87,12 +87,12 @@ sub_0209BE84: ; 0x0209BE84 str r2, [sp] cmp r5, #0x12 blo _0209BE96 - bl sub_02022974 + bl GF_AssertFail _0209BE96: add r0, r6, #4 cmp r0, #0x18 bls _0209BEA0 - bl sub_02022974 + bl GF_AssertFail _0209BEA0: add r4, r7, #4 ldr r1, [sp] @@ -128,7 +128,7 @@ sub_0209BED0: ; 0x0209BED0 ldr r4, [r2, #0] cmp r4, #0x12 blo _0209BEDE - bl sub_02022974 + bl GF_AssertFail pop {r3, r4, r5, pc} _0209BEDE: lsl r5, r4, #2