diff options
Diffstat (limited to 'asm')
113 files changed, 220 insertions, 807 deletions
diff --git a/asm/arm_func.s b/asm/arm_func.s index a84435f..f10e342 100644 --- a/asm/arm_func.s +++ b/asm/arm_func.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_2.s b/asm/code_2.s index a9dbf43..b062aab 100644 --- a/asm/code_2.s +++ b/asm/code_2.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8002774.s b/asm/code_8002774.s index c1e3140..14c5b6c 100644 --- a/asm/code_8002774.s +++ b/asm/code_8002774.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80035F0.s b/asm/code_80035F0.s index 19bb1c3..dd96da9 100644 --- a/asm/code_80035F0.s +++ b/asm/code_80035F0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8004AA0.s b/asm/code_8004AA0.s index 44d52f6..2f1f5bf 100644 --- a/asm/code_8004AA0.s +++ b/asm/code_8004AA0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_800558C.s b/asm/code_800558C.s index ad90f29..9ae474a 100644 --- a/asm/code_800558C.s +++ b/asm/code_800558C.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8009804.s b/asm/code_8009804.s index 8273b0f..9498ccd 100644 --- a/asm/code_8009804.s +++ b/asm/code_8009804.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_800B5F0.s b/asm/code_800B5F0.s index 2afdbed..bcad95a 100644 --- a/asm/code_800B5F0.s +++ b/asm/code_800B5F0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_800D090.s b/asm/code_800D090.s index 505b5e1..dd890d8 100644 --- a/asm/code_800D090.s +++ b/asm/code_800D090.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8012A18.s b/asm/code_8012A18.s index 0a2d752..53f3185 100644 --- a/asm/code_8012A18.s +++ b/asm/code_8012A18.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_801B3C0.s b/asm/code_801B3C0.s index 435b731..9b84072 100644 --- a/asm/code_801B3C0.s +++ b/asm/code_801B3C0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_801C620.s b/asm/code_801C620.s index 2cbc4a8..4770bb5 100644 --- a/asm/code_801C620.s +++ b/asm/code_801C620.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_801D760.s b/asm/code_801D760.s index 6f026d5..3b4d8df 100644 --- a/asm/code_801D760.s +++ b/asm/code_801D760.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_801DCC4.s b/asm/code_801DCC4.s index 52212b1..9ac7c8a 100644 --- a/asm/code_801DCC4.s +++ b/asm/code_801DCC4.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_801EE10.s b/asm/code_801EE10.s index 4de5bb1..84256f9 100644 --- a/asm/code_801EE10.s +++ b/asm/code_801EE10.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_803B050.s b/asm/code_803B050.s index 7e62294..c13b2b6 100644 --- a/asm/code_803B050.s +++ b/asm/code_803B050.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_803C1D0.s b/asm/code_803C1D0.s index fe52d74..fb6c7cf 100644 --- a/asm/code_803C1D0.s +++ b/asm/code_803C1D0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_803D110.s b/asm/code_803D110.s index 1bf4f5d..8ee110e 100644 --- a/asm/code_803D110.s +++ b/asm/code_803D110.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8040094.s b/asm/code_8040094.s index 1e11d74..5ea38ec 100644 --- a/asm/code_8040094.s +++ b/asm/code_8040094.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8041AD0.s b/asm/code_8041AD0.s index 7d4f30a..2b216de 100644 --- a/asm/code_8041AD0.s +++ b/asm/code_8041AD0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80428A0.s b/asm/code_80428A0.s index 321afa0..49ef590 100644 --- a/asm/code_80428A0.s +++ b/asm/code_80428A0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80450F8.s b/asm/code_80450F8.s index ddd60e7..6d391de 100644 --- a/asm/code_80450F8.s +++ b/asm/code_80450F8.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8045A00.s b/asm/code_8045A00.s index 3731a1a..529fb22 100644 --- a/asm/code_8045A00.s +++ b/asm/code_8045A00.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8048480.s b/asm/code_8048480.s index 7520dd1..37e3310 100644 --- a/asm/code_8048480.s +++ b/asm/code_8048480.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8049590.s b/asm/code_8049590.s index 93dc942..846f24c 100644 --- a/asm/code_8049590.s +++ b/asm/code_8049590.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_804ACA0.s b/asm/code_804ACA0.s index f5172dc..7e25d6d 100644 --- a/asm/code_804ACA0.s +++ b/asm/code_804ACA0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s index 5156376..8e97c19 100644 --- a/asm/code_80521D0.s +++ b/asm/code_80521D0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8057144.s b/asm/code_8057144.s index 8973709..8aecb64 100644 --- a/asm/code_8057144.s +++ b/asm/code_8057144.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8057824.s b/asm/code_8057824.s index 456278c..7ea4a18 100644 --- a/asm/code_8057824.s +++ b/asm/code_8057824.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_806CD90.s b/asm/code_806CD90.s index 14e2d70..535fa42 100644 --- a/asm/code_806CD90.s +++ b/asm/code_806CD90.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_807001C.s b/asm/code_807001C.s index 96457c9..958db4f 100644 --- a/asm/code_807001C.s +++ b/asm/code_807001C.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8070BC0.s b/asm/code_8070BC0.s index 36d911a..4435a85 100644 --- a/asm/code_8070BC0.s +++ b/asm/code_8070BC0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8070D04.s b/asm/code_8070D04.s index d995bdc..7a511ab 100644 --- a/asm/code_8070D04.s +++ b/asm/code_8070D04.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8071518.s b/asm/code_8071518.s index 4a5f226..f33352f 100644 --- a/asm/code_8071518.s +++ b/asm/code_8071518.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_807167C.s b/asm/code_807167C.s index acb27c6..ee32631 100644 --- a/asm/code_807167C.s +++ b/asm/code_807167C.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8071858.s b/asm/code_8071858.s index d0cb318..9fc337a 100644 --- a/asm/code_8071858.s +++ b/asm/code_8071858.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80718D8.s b/asm/code_80718D8.s index 35f9c8b..699dad9 100644 --- a/asm/code_80718D8.s +++ b/asm/code_80718D8.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8073B78.s b/asm/code_8073B78.s index 55f8418..84affaa 100644 --- a/asm/code_8073B78.s +++ b/asm/code_8073B78.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8075BA4.s b/asm/code_8075BA4.s index 841838c..2cf8274 100644 --- a/asm/code_8075BA4.s +++ b/asm/code_8075BA4.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_808333C.s b/asm/code_808333C.s index 9256eec..5677a42 100644 --- a/asm/code_808333C.s +++ b/asm/code_808333C.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified @@ -1876,4 +1876,4 @@ sub_80840D8: _080840E4: .4byte gDungeonRngState thumb_func_end sub_80840D8 - .align 2, 0
\ No newline at end of file + .align 2, 0 diff --git a/asm/code_808411C.s b/asm/code_808411C.s index 385dd10..cf6bc94 100644 --- a/asm/code_808411C.s +++ b/asm/code_808411C.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8084160.s b/asm/code_8084160.s index 54f31d7..fce2f1b 100644 --- a/asm/code_8084160.s +++ b/asm/code_8084160.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80848F0.s b/asm/code_80848F0.s index 189480c..3b54680 100644 --- a/asm/code_80848F0.s +++ b/asm/code_80848F0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8085B0C.s b/asm/code_8085B0C.s index 0080472..fa3b3f5 100644 --- a/asm/code_8085B0C.s +++ b/asm/code_8085B0C.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80869E4.s b/asm/code_80869E4.s index 0d39418..2083a2e 100644 --- a/asm/code_80869E4.s +++ b/asm/code_80869E4.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8086A3C.s b/asm/code_8086A3C.s index d0cd7dc..0d2aead 100644 --- a/asm/code_8086A3C.s +++ b/asm/code_8086A3C.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_809017C.s b/asm/code_809017C.s index 3ef1c2c..fefed28 100644 --- a/asm/code_809017C.s +++ b/asm/code_809017C.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8090208.s b/asm/code_8090208.s index 463cffa..81ff2ec 100644 --- a/asm/code_8090208.s +++ b/asm/code_8090208.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8094148.s b/asm/code_8094148.s index 8a2e077..d894e66 100644 --- a/asm/code_8094148.s +++ b/asm/code_8094148.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8094D28.s b/asm/code_8094D28.s index 10991a1..81210da 100644 --- a/asm/code_8094D28.s +++ b/asm/code_8094D28.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8095014.s b/asm/code_8095014.s index bd88144..228811d 100644 --- a/asm/code_8095014.s +++ b/asm/code_8095014.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80958E8.s b/asm/code_80958E8.s index b8d3c7a..b73e519 100644 --- a/asm/code_80958E8.s +++ b/asm/code_80958E8.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_809747C.s b/asm/code_809747C.s index 5c2e04f..05ec4f8 100644 --- a/asm/code_809747C.s +++ b/asm/code_809747C.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8097670.s b/asm/code_8097670.s index 0039819..c4d68ec 100644 --- a/asm/code_8097670.s +++ b/asm/code_8097670.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80983D8.s b/asm/code_80983D8.s index aed2fc9..31cc100 100644 --- a/asm/code_80983D8.s +++ b/asm/code_80983D8.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8098468.s b/asm/code_8098468.s index 1f46809..62154f7 100644 --- a/asm/code_8098468.s +++ b/asm/code_8098468.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8098BDC.s b/asm/code_8098BDC.s index ce93c0d..32f6f5d 100644 --- a/asm/code_8098BDC.s +++ b/asm/code_8098BDC.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_809D148.s b/asm/code_809D148.s index c3a3f96..aa255fb 100644 --- a/asm/code_809D148.s +++ b/asm/code_809D148.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80A26CC.s b/asm/code_80A26CC.s index c7d5fd0..63543ff 100644 --- a/asm/code_80A26CC.s +++ b/asm/code_80A26CC.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8272724.s b/asm/code_8272724.s index b2cad11..b1dd9d4 100644 --- a/asm/code_8272724.s +++ b/asm/code_8272724.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/credits.s b/asm/credits.s index e4ae06b..b95d3dc 100644 --- a/asm/credits.s +++ b/asm/credits.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified @@ -1,4 +1,4 @@ - .include "constants/gba_constants.inc" + #include "asm/constants/gba_constants.inc" .syntax unified @@ -11,7 +11,7 @@ Start: @ 8000000 b Init - .include "asm/rom_header.inc" + #include "rom_header.inc" .arm .align 2, 0 diff --git a/asm/debug_menu.s b/asm/debug_menu.s index 1a1454a..794249f 100644 --- a/asm/debug_menu.s +++ b/asm/debug_menu.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/debug_menu_1.s b/asm/debug_menu_1.s index 08a2888..82f7163 100644 --- a/asm/debug_menu_1.s +++ b/asm/debug_menu_1.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/debug_menu_2.s b/asm/debug_menu_2.s index 1cd5fab..19719a6 100644 --- a/asm/debug_menu_2.s +++ b/asm/debug_menu_2.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/event_flag.s b/asm/event_flag.s index 6777a5b..0623be2 100644 --- a/asm/event_flag.s +++ b/asm/event_flag.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/exclusive_pokemon.s b/asm/exclusive_pokemon.s index 79cd1ff..71152bc 100644 --- a/asm/exclusive_pokemon.s +++ b/asm/exclusive_pokemon.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/felicity_bank.s b/asm/felicity_bank.s index 7711bc9..410f394 100644 --- a/asm/felicity_bank.s +++ b/asm/felicity_bank.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/friend_area_1.s b/asm/friend_area_1.s index b6fe42d..0a16b66 100644 --- a/asm/friend_area_1.s +++ b/asm/friend_area_1.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/friend_area_action_menu.s b/asm/friend_area_action_menu.s index 15b6f88..75d3dd2 100644 --- a/asm/friend_area_action_menu.s +++ b/asm/friend_area_action_menu.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/friend_list_menu.s b/asm/friend_list_menu.s index 391bd3f..98a68a4 100644 --- a/asm/friend_list_menu.s +++ b/asm/friend_list_menu.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/friend_rescue.s b/asm/friend_rescue.s index ef88261..241bbf6 100644 --- a/asm/friend_rescue.s +++ b/asm/friend_rescue.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/ground_effect.s b/asm/ground_effect.s index 8591bbc..3610df8 100644 --- a/asm/ground_effect.s +++ b/asm/ground_effect.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/ground_event.s b/asm/ground_event.s index 871ec68..ba241ec 100644 --- a/asm/ground_event.s +++ b/asm/ground_event.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/ground_link.s b/asm/ground_link.s index 4e8b43b..16e8578 100644 --- a/asm/ground_link.s +++ b/asm/ground_link.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/ground_lives.s b/asm/ground_lives.s index 2c1819b..c85d536 100644 --- a/asm/ground_lives.s +++ b/asm/ground_lives.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/ground_map.s b/asm/ground_map.s index 43ad583..204fda8 100644 --- a/asm/ground_map.s +++ b/asm/ground_map.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/ground_object.s b/asm/ground_object.s index 6425371..71f46eb 100644 --- a/asm/ground_object.s +++ b/asm/ground_object.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/ground_script.s b/asm/ground_script.s index 0bc3285..3a8bf35 100644 --- a/asm/ground_script.s +++ b/asm/ground_script.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/ground_sprite.s b/asm/ground_sprite.s index aa23ef4..1a0d2ac 100644 --- a/asm/ground_sprite.s +++ b/asm/ground_sprite.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/gulpin_shop.s b/asm/gulpin_shop.s index 6482a8a..a8f910d 100644 --- a/asm/gulpin_shop.s +++ b/asm/gulpin_shop.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/jirachi_wish.s b/asm/jirachi_wish.s index f641862..9055379 100644 --- a/asm/jirachi_wish.s +++ b/asm/jirachi_wish.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/kangaskhan_storage.s b/asm/kangaskhan_storage.s index 65f009a..c1cac72 100644 --- a/asm/kangaskhan_storage.s +++ b/asm/kangaskhan_storage.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/kangaskhan_storage_1.s b/asm/kangaskhan_storage_1.s index 4652c29..9890fe4 100644 --- a/asm/kangaskhan_storage_1.s +++ b/asm/kangaskhan_storage_1.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/kangaskhan_storage_2.s b/asm/kangaskhan_storage_2.s index ec64f19..98fc275 100644 --- a/asm/kangaskhan_storage_2.s +++ b/asm/kangaskhan_storage_2.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/kecleon_items.s b/asm/kecleon_items.s index 90bf697..87f2bdd 100644 --- a/asm/kecleon_items.s +++ b/asm/kecleon_items.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/kecleon_items_1.s b/asm/kecleon_items_1.s index 1b20264..e892e48 100644 --- a/asm/kecleon_items_1.s +++ b/asm/kecleon_items_1.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/m4a_1.s b/asm/m4a_1.s index 8c1d78a..b6fe6f9 100644 --- a/asm/m4a_1.s +++ b/asm/m4a_1.s @@ -1,6 +1,6 @@ - .include "asm/macros.inc" - .include "constants/gba_constants.inc" - .include "constants/m4a_constants.inc" + #include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/constants/m4a_constants.inc" .syntax unified diff --git a/asm/macros.inc b/asm/macros.inc deleted file mode 100644 index d821836..0000000 --- a/asm/macros.inc +++ /dev/null @@ -1,3 +0,0 @@ - .include "asm/macros/function.inc" - .include "asm/macros/music_voice.inc" - .include "asm/macros/script.inc" diff --git a/asm/macros/function.inc b/asm/macros/function.inc deleted file mode 100644 index 67fb373..0000000 --- a/asm/macros/function.inc +++ /dev/null @@ -1,29 +0,0 @@ - .macro arm_func_start name - .align 2, 0 - .global \name - .arm - .type \name, function - .endm - - .macro arm_func_end name - .size \name, .-\name - .endm - - .macro thumb_func_start name - .align 2, 0 - .global \name - .thumb - .thumb_func - .type \name, function - .endm - - .macro non_word_aligned_thumb_func_start name - .global \name - .thumb - .thumb_func - .type \name, function - .endm - - .macro thumb_func_end name - .size \name, .-\name - .endm diff --git a/asm/macros/music_voice.inc b/asm/macros/music_voice.inc deleted file mode 100644 index 7dd6c74..0000000 --- a/asm/macros/music_voice.inc +++ /dev/null @@ -1,140 +0,0 @@ - .macro voice_directsound base_midi_key:req, pan:req, sample_data_pointer:req, attack:req, decay:req, sustain:req, release:req - .byte 0 - _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release - .endm - - .macro voice_directsound_no_resample base_midi_key:req, pan:req, sample_data_pointer:req, attack:req, decay:req, sustain:req, release:req - .byte 8 - _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release - .endm - - .macro voice_directsound_alt base_midi_key:req, pan:req, sample_data_pointer:req, attack:req, decay:req, sustain:req, release:req - .byte 16 - _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release - .endm - - .macro _voice_directsound base_midi_key:req, pan:req, sample_data_pointer:req, attack:req, decay:req, sustain:req, release:req - .byte \base_midi_key - .byte 0 - .if \pan != 0 - .byte (0x80 | \pan) - .else - .byte 0 - .endif - .4byte \sample_data_pointer - .byte \attack - .byte \decay - .byte \sustain - .byte \release - .endm - - .macro voice_square_1 base_midi_key:req, pan:req, sweep:req, duty_cycle:req, attack:req, decay:req, sustain:req, release:req - _voice_square_1 1, \base_midi_key, \pan, \sweep, \duty_cycle, \attack, \decay, \sustain, \release - .endm - - .macro voice_square_1_alt base_midi_key:req, pan:req, sweep:req, duty_cycle:req, attack:req, decay:req, sustain:req, release:req - _voice_square_1 9, \base_midi_key, \pan, \sweep, \duty_cycle, \attack, \decay, \sustain, \release - .endm - - .macro _voice_square_1 type:req, base_midi_key:req, pan:req, sweep:req, duty_cycle:req, attack:req, decay:req, sustain:req, release:req - .byte \type - .byte \base_midi_key - .if \pan != 0 - .byte (0x80 | \pan) - .else - .byte 0 - .endif - .byte \sweep - .byte (\duty_cycle & 0x3) - .byte 0, 0, 0 - .byte (\attack & 0x7) - .byte (\decay & 0x7) - .byte (\sustain & 0xF) - .byte (\release & 0x7) - .endm - - .macro voice_square_2 base_midi_key:req, pan:req, duty_cycle:req, attack:req, decay:req, sustain:req, release:req - _voice_square_2 2, \base_midi_key, \pan, \duty_cycle, \attack, \decay, \sustain, \release - .endm - - .macro voice_square_2_alt base_midi_key:req, pan:req, duty_cycle:req, attack:req, decay:req, sustain:req, release:req - _voice_square_2 10, \base_midi_key, \pan, \duty_cycle, \attack, \decay, \sustain, \release - .endm - - .macro _voice_square_2 type:req, base_midi_key:req, pan:req, duty_cycle:req, attack:req, decay:req, sustain:req, release:req - .byte \type - .byte \base_midi_key - .if \pan != 0 - .byte (0x80 | \pan) - .else - .byte 0 - .endif - .byte 0 - .byte (\duty_cycle & 0x3) - .byte 0, 0, 0 - .byte (\attack & 0x7) - .byte (\decay & 0x7) - .byte (\sustain & 0xF) - .byte (\release & 0x7) - .endm - - .macro voice_programmable_wave base_midi_key:req, pan:req, wave_samples_pointer:req, attack:req, decay:req, sustain:req, release:req - _voice_programmable_wave 3, \base_midi_key, \pan, \wave_samples_pointer, \attack, \decay, \sustain, \release - .endm - - .macro voice_programmable_wave_alt base_midi_key:req, pan:req, wave_samples_pointer:req, attack:req, decay:req, sustain:req, release:req - _voice_programmable_wave 11, \base_midi_key, \pan, \wave_samples_pointer, \attack, \decay, \sustain, \release - .endm - - .macro _voice_programmable_wave type:req, base_midi_key:req, pan:req, wave_samples_pointer:req, attack:req, decay:req, sustain:req, release:req - .byte \type - .byte \base_midi_key - .if \pan != 0 - .byte (0x80 | \pan) - .else - .byte 0 - .endif - .byte 0 - .4byte \wave_samples_pointer - .byte (\attack & 0x7) - .byte (\decay & 0x7) - .byte (\sustain & 0xF) - .byte (\release & 0x7) - .endm - - .macro voice_noise base_midi_key:req, pan:req, period:req, attack:req, decay:req, sustain:req, release:req - _voice_noise 4, \base_midi_key, \pan, \period, \attack, \decay, \sustain, \release - .endm - - .macro voice_noise_alt base_midi_key:req, pan:req, period:req, attack:req, decay:req, sustain:req, release:req - _voice_noise 12, \base_midi_key, \pan, \period, \attack, \decay, \sustain, \release - .endm - - .macro _voice_noise type:req, base_midi_key:req, pan:req, period:req, attack:req, decay:req, sustain:req, release:req - .byte \type - .byte \base_midi_key - .if \pan != 0 - .byte (0x80 | \pan) - .else - .byte 0 - .endif - .byte 0 - .byte (\period & 0x1) - .byte 0, 0, 0 - .byte (\attack & 0x7) - .byte (\decay & 0x7) - .byte (\sustain & 0xF) - .byte (\release & 0x7) - .endm - - .macro voice_keysplit voice_group_pointer:req, keysplit_table_pointer:req - .byte 0x40, 0, 0, 0 - .4byte \voice_group_pointer - .4byte \keysplit_table_pointer - .endm - - .macro voice_keysplit_all voice_group_pointer:req - .byte 0x80, 0, 0, 0 - .4byte \voice_group_pointer - .4byte 0 - .endm diff --git a/asm/macros/script.inc b/asm/macros/script.inc deleted file mode 100644 index 8ef4bd8..0000000 --- a/asm/macros/script.inc +++ /dev/null @@ -1,415 +0,0 @@ -.macro warpLocation id:req - .byte 0x01 - .byte 0x00 - .2byte \id - .4byte 0x00, 0x00, 0x00 -.endm - -.macro warpDungeon id:req - .byte 0x02 - .byte 0x00 - .2byte \id - .4byte 0x00, 0x00, 0x00 -.endm - -.macro warpFriendArea time:req - .byte 0x02 - .byte 0x00 - .2byte \time - .4byte 0x00, 0x00, 0x00 -.endm - -.macro ConfirmDungeonRules - .byte 0x05 - .4byte 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00 -.endm - -.macro changeTileset id:req - .byte 0x08, 0x00, 0x00, 0x00 - .2byte \id - .4byte 0x00, 0x00 - .2byte 0x00 -.endm - -@ Start Scene? Run Call? -.macro StartSceneRunCall id:req - .byte 0x0C - .byte \id - .byte 0xFF, 0xFF - .4byte 0x00, 0x00, 0x00 -.endm - -.macro RunCall id:req - .byte 0x0D - .byte \id - .byte 0xFF, 0xFF - .4byte 0x00, 0x00, 0x00 -.endm - -.macro triggerCutscene id:req - .byte 0x1B - .byte 0x00 - .2byte \id - .4byte 0x00, 0x00, 0x00 -.endm - -.macro fadeOut arg0:req time:req arg2:req - .byte 0x23 - .byte \arg0 - .2byte \time - .4byte \arg2 - .4byte 0x00, 0x00 -.endm - -.macro fadeColorOut arg0:req arg1:req time:req color:req - .byte 0x27 - .byte \arg0 - .2byte \arg1 - .4byte \time - .4byte \color - .4byte 0x00 -.endm - -.macro fadeColorIn arg0:req arg1:req time:req color:req - .byte 0x28 - .byte \arg0 - .2byte \arg1 - .4byte \time - .4byte \color - .4byte 0x00 -.endm - -.macro loadData type:req charac:req source:req - .byte 0x2D - .byte \type - .2byte \charac - .2byte \source - .4byte 0x00, 0x00 - .2byte 0x00 -.endm - -@ Face Locations -.set bottomL, 0x2 -.set bottomR, 0x3 -.set insetTopL, 0xE -.set insetTopR, 0xF - -.set previousLoc, 0x15 - -.macro selectFace loc:req charac:req face:req - .byte 0x2E - .byte \loc - .2byte \charac - .4byte \face - .4byte 0x00, 0x00 -.endm - -.macro closeTextBox - .byte 0x30 - .4byte 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00 -.endm - -.macro scrollTextBox character:req textPtr:req - .byte 0x33, 0x00 - .2byte \character - .4byte 0x00, 0x00 - .4byte \textPtr -.endm - -.macro PicNameTextBox character:req textPtr:req - .byte 0x34, 0x00 - .2byte \character - .4byte 0x00, 0x00 - .4byte \textPtr -.endm - -.macro quickCloseTextBox character:req textPtr:req - .byte 0x36, 0x00 - .2byte \character - .4byte 0x00, 0x00 - .4byte \textPtr -.endm - -@ Is it always 0xff, 0xff? -.macro floatingText textPtr:req - .byte 0x37, 0x00 - .byte 0xff, 0xff - .4byte 0x00, 0x00 - .4byte \textPtr -.endm - -.macro fadeFloatingText time:req textPtr:req - .byte 0x39, 0x00 - .2byte \time - .4byte 0x00, 0x00 - .4byte \textPtr -.endm - -.macro YesNoTextBox eventID:req character:req textPtr:req - .byte 0x3A, 0x00 - .2byte \eventID - .2byte \character - .2byte 0x00 - .4byte 0x00 - .4byte \textPtr -.endm - -.macro showName arg0:req - .byte 0x3B - .byte \arg0 - .2byte 0x00 - .4byte 0x00, 0x00, 0x00 -.endm - -@ TODO: 0x3C has a lot of different cases... - -.macro renamePoke id:req - .byte 0x3D, 0x00, 0x00, 0x00 - .byte \id, 0x00, 0x00, 0x00 - .4byte 0x00, 0x00 -.endm - -.macro renameTeam - .byte 0x3D, 0x00, 0x00, 0x00 - .4byte 0x00, 0x00, 0x00 -.endm - -.macro abruptStopMusic - .byte 0x42 - .4byte 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00 -.endm - -.macro fadeMusic time:req - .byte 0x43 - .byte 0x00 - .2byte \time - .4byte 0x00, 0x00, 0x00 -.endm - -.macro PlayMusic id:req - .byte 0x44 - .byte 0x00 - .2byte 0x0 - .2byte \id - .2byte 0x00 - .4byte 0x00, 0x00 -.endm - -.macro fadeInMusic id:req time:req - .byte 0x45, 0x00 - .2byte \id - .2byte \time - .4byte 0x00, 0x00 - .2byte 0x00 -.endm - -@ Also seen referred to as StopSng -.macro pushR14 - .byte 0x47 - .4byte 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00 -.endm - -.macro fadeMusicOut time:req - .byte 0x48 - .byte 0x00 - .2byte \time - .4byte 0x00, 0x00, 0x00 -.endm - -.macro playSound id:req - .byte 0x4C - .byte 0x00, 0x00, 0x00 - .2byte \id - .4byte 0x00, 0x00 - .2byte 0x00 -.endm - -.macro stopSound id:req - .byte 0x4D - .byte 0x00, 0x00, 0x00 - .2byte \id - .4byte 0x00, 0x00 - .2byte 0x00 -.endm - -.macro setAnimation anim:req - .byte 0x54 - .byte 0x00 - .2byte \anim - .4byte 0x00, 0x00, 0x00 -.endm - -.macro warpToLoc id:req - .byte 0x5B, 0x00 - .2byte 0x00 - .byte \id - .byte 0x00, 0x00, 0x00 - .4byte 0x00, 0x00 -.endm - -@ move to prefined location along grid -.macro gridMoveTo speed:req id:req - .byte 0x6B, 0x00 - .2byte \speed - .byte \id - .4byte 0x00, 0x00 - .byte 0x00, 0x00, 0x00 -.endm - -.macro changeSpriteZ speed:req targetHeight:req - .byte 0x70, 0x00 - .byte \speed - .3byte \targetHeight - .4byte 0x00, 0x00 - .2byte 0x00 -.endm - -@ Rotation Directions -.set CW, 1 -.set CCW, 2 -.set shortestDir, 0xA - -@ Cardinal Directions / Facing Directions -.set south, 0 -.set southeast, 1 -.set east, 2 -.set northeast, 3 -.set north, 4 -.set northwest, 5 -.set west, 6 -.set southwest, 7 - -.macro setFaceDir delay:req faceDir:req - .byte 0x8B - .byte \delay - .byte \faceDir - .byte 0x00 - .4byte 0x00, 0x00, 0x00 -.endm - -.macro rotate time:req rotDir:req faceDir:req - .byte 0x91 - .byte \time - .byte \rotDir - .byte 0x00 - .byte \faceDir - .byte 0x00 - .4byte 0x00, 0x00 - .2byte 0x00 -.endm - -.macro initVariableTextBox arg0:req arg1:req speaker:req - .byte 0xCF - .byte \arg0 - .byte \arg1 - .byte 0x00 - .4byte \speaker - .4byte 0x00, 0x00 -.endm - -.macro variableTextBox version:req textPtr:req - .byte 0xD0, 0x00 - .2byte \version - .4byte 0x00, 0x00 - .4byte \textPtr -.endm - -.macro elseTextBox textPtr:req - .byte 0xD1, 0x00 - .4byte 0x00, 0x00 - .byte 0x00, 0x00 - .4byte \textPtr -.endm - -.macro pause time:req - .byte 0xDB - .byte 0x00 - .2byte \time - .4byte 0x00, 0x00, 0x00 -.endm - -@ Wait for sound to finish playing? -.macro waitSound id:req - .byte 0xE2 - .byte 0x00 - .2byte \id - .4byte 0x00, 0x00, 0x00 -.endm - -.macro waitFlag flagnum:req - .byte 0xE3 - .byte 0x00 - .2byte \flagnum - .4byte 0x00, 0x00, 0x00 -.endm - -.macro setFlag flagnum:req - .byte 0xE4 - .byte 0x00 - .2byte \flagnum - .4byte 0x00, 0x00, 0x00 -.endm - -.macro goTo id:req - .byte 0xE5 - .byte 0x00 - .byte \id - .byte 0x00 - .4byte 0x00, 0x00, 0x00 -.endm - -@ Loop at label until end of scene -.macro loopLabel id:req - .byte 0xE7, 0x00 - .byte \id, 0x00 - .4byte 0x00, 0x00, 0x00 -.endm - -.macro executeScript scriptNum:req - .byte 0xE8 - .byte 0x00 - .2byte \scriptNum - .4byte 0x00, 0x00, 0x00 -.endm - -.macro MsgEnd arg0:req - .byte 0xE9 - .byte 0x00 - .2byte \arg0 - .4byte 0x00, 0x00, 0x00 -.endm - -.macro endFuncContinueScript - .byte 0xEE - .4byte 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00 -.endm - -.macro endFuncandScript - .byte 0xEF - .4byte 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00 -.endm - -.macro closeThread - .byte 0xF0 - .4byte 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00 -.endm - -.macro closeThreadRemoveObject - .byte 0xF1 - .4byte 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00 -.endm - -@ Set label for loop -.macro label id:req - .byte 0xF4, 0x00 - .byte \id, 0x00 - .4byte 0x00, 0x00, 0x00 -.endm diff --git a/asm/mailbox.s b/asm/mailbox.s index f164a29..d99fbde 100644 --- a/asm/mailbox.s +++ b/asm/mailbox.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/makuhita_dojo.s b/asm/makuhita_dojo.s index ef01d6d..f43f21f 100644 --- a/asm/makuhita_dojo.s +++ b/asm/makuhita_dojo.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/memory.s b/asm/memory.s index e856585..8fd07a2 100644 --- a/asm/memory.s +++ b/asm/memory.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/memory_1.s b/asm/memory_1.s index 97833ca..7896523 100644 --- a/asm/memory_1.s +++ b/asm/memory_1.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/moves_1.s b/asm/moves_1.s index c9f1ce8..969c450 100644 --- a/asm/moves_1.s +++ b/asm/moves_1.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/music.s b/asm/music.s index 4d617a6..c617794 100644 --- a/asm/music.s +++ b/asm/music.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/other_menus.s b/asm/other_menus.s index 676ba9a..9fe889d 100644 --- a/asm/other_menus.s +++ b/asm/other_menus.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/pelipper_board.s b/asm/pelipper_board.s index 20119ed..3ab0db1 100644 --- a/asm/pelipper_board.s +++ b/asm/pelipper_board.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/pokemon.s b/asm/pokemon.s index 3682c14..105c4ed 100644 --- a/asm/pokemon.s +++ b/asm/pokemon.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/pokemon_2.s b/asm/pokemon_2.s index dec099a..2ffbf37 100644 --- a/asm/pokemon_2.s +++ b/asm/pokemon_2.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s index fc29dfb..43173ec 100644 --- a/asm/pokemon_3.s +++ b/asm/pokemon_3.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/rescue_password_menu.s b/asm/rescue_password_menu.s index 44675db..99e1211 100644 --- a/asm/rescue_password_menu.s +++ b/asm/rescue_password_menu.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/sprite.s b/asm/sprite.s index 284526c..2714e7e 100644 --- a/asm/sprite.s +++ b/asm/sprite.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/unk_menu_203B360.s b/asm/unk_menu_203B360.s index 5ac6b47..d2962a7 100644 --- a/asm/unk_menu_203B360.s +++ b/asm/unk_menu_203B360.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/unk_menu_203B364.s b/asm/unk_menu_203B364.s index 40e9de2..d0a2b6e 100644 --- a/asm/unk_menu_203B364.s +++ b/asm/unk_menu_203B364.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/wonder_mail_2.s b/asm/wonder_mail_2.s index dd6f99f..383a1c6 100644 --- a/asm/wonder_mail_2.s +++ b/asm/wonder_mail_2.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/wonder_mail_3.s b/asm/wonder_mail_3.s index 2423107..043c1e7 100644 --- a/asm/wonder_mail_3.s +++ b/asm/wonder_mail_3.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/wonder_mail_3_mid.s b/asm/wonder_mail_3_mid.s index 4aa1e3b..90c0c25 100644 --- a/asm/wonder_mail_3_mid.s +++ b/asm/wonder_mail_3_mid.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/wonder_mail_4.s b/asm/wonder_mail_4.s index ea27a3f..8103af1 100644 --- a/asm/wonder_mail_4.s +++ b/asm/wonder_mail_4.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/wonder_mail_5.s b/asm/wonder_mail_5.s index cad53b3..e461b13 100644 --- a/asm/wonder_mail_5.s +++ b/asm/wonder_mail_5.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified |