Map Anpassungen

data/overworld/overworld_data.s

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

data/overworld/overworld_pal_table.s

@@ -794,10 +794,10 @@ ow_pal_table:
 .word ow_objekt_0019Pal, 0xC313
 .word ow_objekt_0020Pal, 0xC314
 .word ow_objekt_0021Pal, 0xC315
-.word ow_00000Pal, 0xC316
-.word ow_00000Pal, 0xC317
-.word ow_00000Pal, 0xC318
-.word ow_00000Pal, 0xC319
+.word ow_objekt_0022Pal, 0xC316
+.word ow_objekt_0023Pal, 0xC317
+.word ow_objekt_0024Pal, 0xC318
+.word ow_objekt_0025Pal, 0xC319
 .word ow_00000Pal, 0xC31A
 .word ow_00000Pal, 0xC31B
 .word ow_00000Pal, 0xC31C

sots-private

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

src/include/constants/pymap/main_story_variables.h

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

src/include/constants/pymap/main_story_variables.s

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

src/include/constants/pymap/starter_variables.h

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

src/include/constants/pymap/starter_variables.s

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

src/include/script/language.h

@@ -89,6 +89,14 @@
 
 @@ Custom commands
 
+.macro showcitynameon
+setflag 0x4000
+.endm
+
+.macro showcitynameoff
+clearflag 0x4000
+.endm
+
 .macro callifvar callifvar_var:req callifvar_value:req callifvar_operands:req callifvar_pointer:req
 compare \callifvar_var \callifvar_value
 callif \callifvar_operands \callifvar_pointer

src/trainer/trainerbattle_init.c

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