Browse Source

Map Anpassungen

dragonflysots 6 years ago
parent
commit
60ce8a484f

+ 0
- 1
data/overworld/overworld_data.s View File

@@ -4996,7 +4996,6 @@ ow_data_objekt_0025:
4996 4996
 .hword 0xFFFF, 0xC319, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
4997 4997
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_objekt_0025, 0x8231CFC
4998 4998
 
4999
-
5000 4999
 .align 2
5001 5000
 ow_data_objekt_0026:
5002 5001
 .hword 0xFFFF, 0xC31A, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0

+ 4
- 4
data/overworld/overworld_pal_table.s View File

@@ -794,10 +794,10 @@ ow_pal_table:
794 794
 .word ow_objekt_0019Pal, 0xC313
795 795
 .word ow_objekt_0020Pal, 0xC314
796 796
 .word ow_objekt_0021Pal, 0xC315
797
-.word ow_00000Pal, 0xC316
798
-.word ow_00000Pal, 0xC317
799
-.word ow_00000Pal, 0xC318
800
-.word ow_00000Pal, 0xC319
797
+.word ow_objekt_0022Pal, 0xC316
798
+.word ow_objekt_0023Pal, 0xC317
799
+.word ow_objekt_0024Pal, 0xC318
800
+.word ow_objekt_0025Pal, 0xC319
801 801
 .word ow_00000Pal, 0xC31A
802 802
 .word ow_00000Pal, 0xC31B
803 803
 .word ow_00000Pal, 0xC31C

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 9781b1572914460b4f1afbccbf28155a87d5c8c5
1
+Subproject commit 0eb1bd3c286b789bb9c238fefe458ed0b38dc979

+ 1
- 1
src/include/constants/pymap/main_story_variables.h View File

@@ -1,4 +1,4 @@
1
-#define VAR_STORYVERLAUF 0x5051
1
+#define VAR_STORYVERLAUF 0x5052
2 2
 #define VALUE_UNTERRICHT_SCHULE 0x0
3 3
 #define VALUE_RIVALE_SCHULE_INDOOR 0x1
4 4
 #define VALUE_RIVALE_SCHULE_OUTDOOR 0x2

+ 1
- 1
src/include/constants/pymap/main_story_variables.s View File

@@ -1,4 +1,4 @@
1
-.equ VAR_STORYVERLAUF, 0x5051
1
+.equ VAR_STORYVERLAUF, 0x5052
2 2
 .equ VALUE_UNTERRICHT_SCHULE, 0x0
3 3
 .equ VALUE_RIVALE_SCHULE_INDOOR, 0x1
4 4
 .equ VALUE_RIVALE_SCHULE_OUTDOOR, 0x2

+ 1
- 1
src/include/constants/pymap/starter_variables.h View File

@@ -1,4 +1,4 @@
1
-#define VAR_STARTER_PLAYER_POKEMON 0x5052
1
+#define VAR_STARTER_PLAYER_POKEMON 0x5051
2 2
 #define VALUE_STARTER_BISASAM 0x0
3 3
 #define VALUE_STARTER_GLUMANDA 0x1
4 4
 #define VALUE_STARTER_SCHIGGY 0x2

+ 1
- 1
src/include/constants/pymap/starter_variables.s View File

@@ -1,4 +1,4 @@
1
-.equ VAR_STARTER_PLAYER_POKEMON, 0x5052
1
+.equ VAR_STARTER_PLAYER_POKEMON, 0x5051
2 2
 .equ VALUE_STARTER_BISASAM, 0x0
3 3
 .equ VALUE_STARTER_GLUMANDA, 0x1
4 4
 .equ VALUE_STARTER_SCHIGGY, 0x2

+ 8
- 0
src/include/script/language.h View File

@@ -89,6 +89,14 @@
89 89
 
90 90
 @@ Custom commands
91 91
 
92
+.macro showcitynameon
93
+setflag 0x4000
94
+.endm
95
+
96
+.macro showcitynameoff
97
+clearflag 0x4000
98
+.endm
99
+
92 100
 .macro callifvar callifvar_var:req callifvar_value:req callifvar_operands:req callifvar_pointer:req
93 101
 compare \callifvar_var \callifvar_value
94 102
 callif \callifvar_operands \callifvar_pointer

+ 2
- 3
src/trainer/trainerbattle_init.c View File

@@ -1,6 +1,7 @@
1 1
 #include <pokeagb/pokeagb.h>
2 2
 #include <agb_debug.h>
3 3
 #include <trainer_rival_encounters.h>
4
+#include <pymap_constants.h>
4 5
 
5 6
 void battle_intro_launch(u8 environment) {
6 7
     TaskCallback introTask;
@@ -42,12 +43,10 @@ union TrainerPokemonPtr battle_trainer_get_rival(u8 chosenStarterValue, u8 encou
42 43
     return (union TrainerPokemonPtr)(rival_encounters[encounterNumber].partyArray.undefinedStructure + (chosenStarterValue * partyCount * structureSize));
43 44
 }
44 45
 
45
-#define VAR_STARTER 0x5052
46
-
47 46
 union TrainerPokemonPtr battle_trainer_get_rival_or_null(u8 tid) {
48 47
     for(u16 i = 0; i < RIVAL_ENCOUNTER_COUNT; ++i) {
49 48
         if(rival_encounters[i].trainerId == tid) {
50
-            return battle_trainer_get_rival(var_load(VAR_STARTER), i, trainer_data[tid].flags);
49
+            return battle_trainer_get_rival(var_load(VAR_STARTER_PLAYER_POKEMON), i, trainer_data[tid].flags);
51 50
         }
52 51
     }
53 52
     union TrainerPokemonPtr nullPokemon = {.undefinedStructure = NULL};